diff -Naur mate-control-center-20120329-old//capplets/common/capplet-util.c mate-control-center-20120329/capplets/common/capplet-util.c --- mate-control-center-20120329-old//capplets/common/capplet-util.c 2012-03-29 20:41:01.000000000 +0300 +++ mate-control-center-20120329/capplets/common/capplet-util.c 2012-04-02 23:17:54.505201900 +0300 @@ -80,7 +80,7 @@ else screen = gtk_widget_get_screen (GTK_WIDGET (parent)); - uri = g_strdup_printf ("ghelp:user-guide#%s", section); + uri = g_strdup_printf ("http://mate-desktop.org/"); if (!gtk_show_uri (screen, uri, gtk_get_current_event_time (), &error)) { capplet_error_dialog ( diff -Naur mate-control-center-20120329-old//libslab/libslab-utils.c mate-control-center-20120329/libslab/libslab-utils.c --- mate-control-center-20120329-old//libslab/libslab-utils.c 2012-03-29 20:41:02.000000000 +0300 +++ mate-control-center-20120329/libslab/libslab-utils.c 2012-04-02 23:18:10.040842992 +0300 @@ -220,7 +220,7 @@ doc_path = libslab_mate_desktop_item_get_docpath (item); if (doc_path) { - help_uri = g_strdup_printf ("ghelp:%s", doc_path); + help_uri = g_strdup_printf ("http://mate-desktop.org/"); if (!gtk_show_uri (libslab_get_current_screen (), help_uri, gtk_get_current_event_time (), &error)) { g_warning ("error opening %s [%s]\n", help_uri, error->message); diff -Naur mate-control-center-20120329-old//libslab/slab-mate-util.c mate-control-center-20120329/libslab/slab-mate-util.c --- mate-control-center-20120329-old//libslab/slab-mate-util.c 2012-03-29 20:41:02.000000000 +0300 +++ mate-control-center-20120329/libslab/slab-mate-util.c 2012-04-02 23:18:23.769525878 +0300 @@ -273,7 +273,7 @@ if (doc_path) { - help_uri = g_strdup_printf ("ghelp:%s", doc_path); + help_uri = g_strdup_printf ("http://mate-desktop.org/"); error = NULL; if (!gtk_show_uri (libslab_get_current_screen (), help_uri, gtk_get_current_event_time (), &error)) From e21d8f9c10ac711504e1bccf2a237726dbc9713b Mon Sep 17 00:00:00 2001 From: George Vlahavas Date: Tue, 3 Apr 2012 23:33:55 +0300 Subject: [PATCH 1/5] Removed help buttons from at-enable-dialog, appearance dialog and default-applications-properties dialog --- .../at-properties/at-enable-dialog.ui | 16 ------------ capplets/appearance/data/appearance.ui | 26 -------------------- .../mate-default-applications-properties.ui | 16 ------------ 3 files changed, 0 insertions(+), 58 deletions(-) diff --git a/capplets/accessibility/at-properties/at-enable-dialog.ui b/capplets/accessibility/at-properties/at-enable-dialog.ui index 721c45c..4cbf0e3 100644 --- a/capplets/accessibility/at-properties/at-enable-dialog.ui +++ b/capplets/accessibility/at-properties/at-enable-dialog.ui @@ -266,21 +266,6 @@ True end - - gtk-help - True - True - True - False - True - - - False - False - 0 - - - Close and _Log Out True @@ -323,7 +308,6 @@ - at_help_button at_close_logout_button at_close_button diff --git a/capplets/appearance/data/appearance.ui b/capplets/appearance/data/appearance.ui index d97b237..7c8fdaf 100644 --- a/capplets/appearance/data/appearance.ui +++ b/capplets/appearance/data/appearance.ui @@ -1560,22 +1560,6 @@ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK end - - gtk-help - True - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True - - - False - False - 0 - True - - - gtk-close True @@ -1600,7 +1584,6 @@ - help_button close_button @@ -2399,14 +2382,6 @@ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK end - - gtk-help - True - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True - False False @@ -2438,7 +2413,6 @@ - theme_help_button theme_close_button diff --git a/capplets/default-applications/mate-default-applications-properties.ui b/capplets/default-applications/mate-default-applications-properties.ui index 0da56bc..a04aa49 100644 --- a/capplets/default-applications/mate-default-applications-properties.ui +++ b/capplets/default-applications/mate-default-applications-properties.ui @@ -1484,21 +1484,6 @@ True end - - gtk-help - True - True - True - False - True - - - False - False - 0 - - - gtk-close True @@ -1523,7 +1508,6 @@ - helpbutton1 closebutton1 -- 1.7.4.4 From 1f765d2d7df6f64d91b2e464902b81e0a70ba258 Mon Sep 17 00:00:00 2001 From: George Vlahavas Date: Tue, 3 Apr 2012 23:43:59 +0300 Subject: [PATCH 2/5] Removed help files from the rest of the ui files --- capplets/display/display-capplet.ui | 16 ---------------- capplets/keybindings/mate-keybinding-properties.ui | 15 --------------- .../mate-keyboard-properties-a11y-notifications.ui | 15 --------------- .../mate-keyboard-properties-options-dialog.ui | 15 --------------- capplets/mouse/mate-mouse-properties.ui | 16 ---------------- capplets/network/mate-network-properties.ui | 16 ---------------- capplets/windows/mate-window-properties.ui | 16 ---------------- 7 files changed, 0 insertions(+), 109 deletions(-) diff --git a/capplets/display/display-capplet.ui b/capplets/display/display-capplet.ui index 82ed92b..4bd23a5 100644 --- a/capplets/display/display-capplet.ui +++ b/capplets/display/display-capplet.ui @@ -339,22 +339,6 @@ True end - - gtk-help - True - True - True - False - True - - - False - False - 0 - True - - - Make Default True diff --git a/capplets/keybindings/mate-keybinding-properties.ui b/capplets/keybindings/mate-keybinding-properties.ui index ecd0ae2..7f18aeb 100644 --- a/capplets/keybindings/mate-keybinding-properties.ui +++ b/capplets/keybindings/mate-keybinding-properties.ui @@ -90,21 +90,6 @@ True end - - gtk-help - True - True - True - False - True - - - False - False - 0 - - - gtk-add True diff --git a/capplets/keyboard/mate-keyboard-properties-a11y-notifications.ui b/capplets/keyboard/mate-keyboard-properties-a11y-notifications.ui index 3f33d99..5ac150e 100644 --- a/capplets/keyboard/mate-keyboard-properties-a11y-notifications.ui +++ b/capplets/keyboard/mate-keyboard-properties-a11y-notifications.ui @@ -480,21 +480,6 @@ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK end - - gtk-help - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True - - - False - False - 0 - - - gtk-close True diff --git a/capplets/keyboard/mate-keyboard-properties-options-dialog.ui b/capplets/keyboard/mate-keyboard-properties-options-dialog.ui index f92c4cd..f4f216c 100644 --- a/capplets/keyboard/mate-keyboard-properties-options-dialog.ui +++ b/capplets/keyboard/mate-keyboard-properties-options-dialog.ui @@ -48,21 +48,6 @@ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK end - - gtk-help - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True - - - False - False - 0 - - - gtk-close True diff --git a/capplets/mouse/mate-mouse-properties.ui b/capplets/mouse/mate-mouse-properties.ui index b855ff1..0241613 100644 --- a/capplets/mouse/mate-mouse-properties.ui +++ b/capplets/mouse/mate-mouse-properties.ui @@ -1661,21 +1661,6 @@ True end - - gtk-help - True - True - True - False - True - - - False - False - 0 - - - gtk-close True @@ -1700,7 +1685,6 @@ - helpbutton1 closebutton1 diff --git a/capplets/network/mate-network-properties.ui b/capplets/network/mate-network-properties.ui index 29c3c3e..9c1d334 100644 --- a/capplets/network/mate-network-properties.ui +++ b/capplets/network/mate-network-properties.ui @@ -690,21 +690,6 @@ True end - - gtk-help - True - True - True - False - True - - - False - False - 0 - - - _Delete Location True @@ -745,7 +730,6 @@ - helpbutton1 delete_button closebutton1 diff --git a/capplets/windows/mate-window-properties.ui b/capplets/windows/mate-window-properties.ui index dee6e1a..a060c7d 100644 --- a/capplets/windows/mate-window-properties.ui +++ b/capplets/windows/mate-window-properties.ui @@ -329,21 +329,6 @@ True end - - gtk-help - True - True - True - False - True - - - False - False - 0 - - - gtk-close True @@ -368,7 +353,6 @@ - helpbutton1 closebutton1 -- 1.7.4.4 From 4c8441ea154eb48b5662021e9be2e5d93497ffb6 Mon Sep 17 00:00:00 2001 From: George Vlahavas Date: Tue, 3 Apr 2012 23:50:56 +0300 Subject: [PATCH 3/5] Removed helpbutton reference from display-capplet.ui --- capplets/display/display-capplet.ui | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/capplets/display/display-capplet.ui b/capplets/display/display-capplet.ui index 4bd23a5..99639b8 100644 --- a/capplets/display/display-capplet.ui +++ b/capplets/display/display-capplet.ui @@ -392,7 +392,6 @@ - helpbutton1 make_default_button apply_button button2 -- 1.7.4.4 From 6f52b917b59a913a39ebcb5815828875be7ebfcc Mon Sep 17 00:00:00 2001 From: George Vlahavas Date: Tue, 3 Apr 2012 23:52:56 +0300 Subject: [PATCH 4/5] Removed helpbutton reference from mate-keybinding-properties.ui --- capplets/keybindings/mate-keybinding-properties.ui | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/capplets/keybindings/mate-keybinding-properties.ui b/capplets/keybindings/mate-keybinding-properties.ui index 7f18aeb..d5fc1ff 100644 --- a/capplets/keybindings/mate-keybinding-properties.ui +++ b/capplets/keybindings/mate-keybinding-properties.ui @@ -145,7 +145,6 @@ - helpbutton1 add-button remove-button button1 -- 1.7.4.4 From db076258a9bc2ee0d05455a56959422c94280f84 Mon Sep 17 00:00:00 2001 From: George Vlahavas Date: Tue, 3 Apr 2012 23:56:10 +0300 Subject: [PATCH 5/5] Removed left over packing elements from appearance.ui --- capplets/appearance/data/appearance.ui | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/capplets/appearance/data/appearance.ui b/capplets/appearance/data/appearance.ui index 7c8fdaf..495bf2e 100644 --- a/capplets/appearance/data/appearance.ui +++ b/capplets/appearance/data/appearance.ui @@ -2382,13 +2382,6 @@ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK end - - False - False - 0 - - - gtk-close True -- 1.7.4.4