From 0dbf2f8672579549f09a39fa5c238e8347e3f9dd Mon Sep 17 00:00:00 2001 From: infirit Date: Wed, 5 Feb 2014 01:39:10 +0100 Subject: Fix help uri for applets --- accessx-status/applet.c | 2 +- battstat/battstat_applet.c | 4 ++-- charpick/charpick.c | 2 +- charpick/properties.c | 2 +- cpufreq/src/cpufreq-applet.c | 2 +- cpufreq/src/cpufreq-prefs.c | 2 +- drivemount/drivemount.c | 2 +- geyes/geyes.c | 2 +- geyes/themes.c | 2 +- invest-applet/invest/help.py | 4 ++-- mateweather/mateweather-pref.c | 2 +- multiload/main.c | 2 +- multiload/properties.c | 2 +- stickynotes/stickynotes.c | 2 +- stickynotes/stickynotes_applet_callbacks.c | 4 ++-- trashapplet/src/trashapplet.c | 2 +- 16 files changed, 19 insertions(+), 19 deletions(-) diff --git a/accessx-status/applet.c b/accessx-status/applet.c index e69e1fca..e97acb0b 100644 --- a/accessx-status/applet.c +++ b/accessx-status/applet.c @@ -156,7 +156,7 @@ static void help_cb(GtkAction* action, AccessxStatusApplet* sapplet) GError* error = NULL; GdkScreen* screen = gtk_widget_get_screen(GTK_WIDGET(sapplet->applet)); - gtk_show_uri(screen, "help:accessx-status", gtk_get_current_event_time(), &error); + gtk_show_uri(screen, "help:mate-accessx-status", gtk_get_current_event_time(), &error); if (error) { diff --git a/battstat/battstat_applet.c b/battstat/battstat_applet.c index 5a8f58f9..9de1ff7c 100644 --- a/battstat/battstat_applet.c +++ b/battstat/battstat_applet.c @@ -1358,9 +1358,9 @@ battstat_show_help( ProgressData *battstat, const char *section ) char *uri; if (section) - uri = g_strdup_printf ("help:battstat?%s", section); + uri = g_strdup_printf ("help:mate-battstat/%s", section); else - uri = g_strdup ("help:battstat"); + uri = g_strdup ("help:mate-battstat"); gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (battstat->applet)), uri, diff --git a/charpick/charpick.c b/charpick/charpick.c index adce6bcf..861c29a8 100644 --- a/charpick/charpick.c +++ b/charpick/charpick.c @@ -610,7 +610,7 @@ help_cb (GtkAction *action, GError *error = NULL; gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (curr_data->applet)), - "help:char-palette", + "help:mate-char-palette", gtk_get_current_event_time (), &error); diff --git a/charpick/properties.c b/charpick/properties.c index 8038af58..e732a730 100644 --- a/charpick/properties.c +++ b/charpick/properties.c @@ -500,7 +500,7 @@ phelp_cb (GtkDialog *dialog, gint tab, gpointer data) GError *error = NULL; gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (dialog)), - "help:char-palette?charpick-prefs", + "help:mate-char-palette/charpick-prefs", gtk_get_current_event_time (), &error); diff --git a/cpufreq/src/cpufreq-applet.c b/cpufreq/src/cpufreq-applet.c index 395bb351..b066c919 100644 --- a/cpufreq/src/cpufreq-applet.c +++ b/cpufreq/src/cpufreq-applet.c @@ -657,7 +657,7 @@ cpufreq_applet_help_cb (GtkAction *action, GError *error = NULL; gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (applet)), - "help:cpufreq-applet", + "help:mate-cpufreq-applet", gtk_get_current_event_time (), &error); diff --git a/cpufreq/src/cpufreq-prefs.c b/cpufreq/src/cpufreq-prefs.c index e1a9edba..66ca8b3f 100644 --- a/cpufreq/src/cpufreq-prefs.c +++ b/cpufreq/src/cpufreq-prefs.c @@ -386,7 +386,7 @@ cpufreq_prefs_dialog_response_cb (CPUFreqPrefs *prefs, if (response == GTK_RESPONSE_HELP) { gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (prefs->priv->dialog)), - "help:cpufreq-applet?cpufreq-applet-prefs", + "help:mate-cpufreq-applet/cpufreq-applet-prefs", gtk_get_current_event_time (), &error); diff --git a/drivemount/drivemount.c b/drivemount/drivemount.c index 04d7d06f..60fa1457 100644 --- a/drivemount/drivemount.c +++ b/drivemount/drivemount.c @@ -131,7 +131,7 @@ display_help (GtkAction *action, GError *error = NULL; gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (drive_list)), - "help:drivemount?drivemount", + "help:mate-drivemount/drivemount", gtk_get_current_event_time (), &error); diff --git a/geyes/geyes.c b/geyes/geyes.c index 91bf8a67..07c17256 100644 --- a/geyes/geyes.c +++ b/geyes/geyes.c @@ -351,7 +351,7 @@ help_cb (GtkAction *action, GError *error = NULL; gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (eyes_applet->applet)), - "help:geyes", + "help:mate-geyes", gtk_get_current_event_time (), &error); diff --git a/geyes/themes.c b/geyes/themes.c index fea26060..f7df773b 100644 --- a/geyes/themes.c +++ b/geyes/themes.c @@ -217,7 +217,7 @@ phelp_cb (GtkDialog *dialog) GError *error = NULL; gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (dialog)), - "help:geyes?geyes-settings", + "help:mate-geyes/geyes-settings", gtk_get_current_event_time (), &error); diff --git a/invest-applet/invest/help.py b/invest-applet/invest/help.py index 81c74fac..4a6b1cd3 100644 --- a/invest-applet/invest/help.py +++ b/invest-applet/invest/help.py @@ -7,7 +7,7 @@ from gi.repository import Gtk from gi.repository import Gdk def show_help(): - Gtk.show_uri(None, "help:invest-applet", Gdk.CURRENT_TIME) + Gtk.show_uri(None, "help:mate-invest-applet", Gdk.CURRENT_TIME) def show_help_section(id): - Gtk.show_uri(None, "help:invest-applet?%s" % id, Gdk.CURRENT_TIME) + Gtk.show_uri(None, "help:mate-invest-applet/%s" % id, Gdk.CURRENT_TIME) diff --git a/mateweather/mateweather-pref.c b/mateweather/mateweather-pref.c index 2fb8a116..4ac80e8a 100644 --- a/mateweather/mateweather-pref.c +++ b/mateweather/mateweather-pref.c @@ -751,7 +751,7 @@ static void help_cb(GtkDialog* dialog) { GError* error = NULL; - gtk_show_uri(gtk_widget_get_screen(GTK_WIDGET(dialog)), "help:mateweather?mateweather-settings", gtk_get_current_event_time(), &error); + gtk_show_uri(gtk_widget_get_screen(GTK_WIDGET(dialog)), "help:mateweather/mateweather-settings", gtk_get_current_event_time(), &error); if (error) { diff --git a/multiload/main.c b/multiload/main.c index db94fdaf..6efa2e31 100644 --- a/multiload/main.c +++ b/multiload/main.c @@ -80,7 +80,7 @@ help_cb (GtkAction *action, GError *error = NULL; gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (ma->applet)), - "help:multiload", + "help:mate-multiload", gtk_get_current_event_time (), &error); diff --git a/multiload/properties.c b/multiload/properties.c index 082378a9..df2433d1 100644 --- a/multiload/properties.c +++ b/multiload/properties.c @@ -84,7 +84,7 @@ properties_close_cb (GtkWidget *widget, gint arg, MultiloadApplet *ma) case GTK_RESPONSE_HELP: gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (ma->applet)), - "help:multiload?multiload-prefs", + "help:mate-multiload/multiload-prefs", gtk_get_current_event_time (), &error); diff --git a/stickynotes/stickynotes.c b/stickynotes/stickynotes.c index bb80dcf3..d4e82ace 100644 --- a/stickynotes/stickynotes.c +++ b/stickynotes/stickynotes.c @@ -388,7 +388,7 @@ response_cb (GtkWidget *dialog, gint id, gpointer data) { if (id == GTK_RESPONSE_HELP) gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (dialog)), - "help:stickynotes_applet?stickynotes-settings-individual", + "help:mate-stickynotes_applet/stickynotes-settings-individual", gtk_get_current_event_time (), NULL); else if (id == GTK_RESPONSE_CLOSE) diff --git a/stickynotes/stickynotes_applet_callbacks.c b/stickynotes/stickynotes_applet_callbacks.c index 71d015ec..980b9a10 100644 --- a/stickynotes/stickynotes_applet_callbacks.c +++ b/stickynotes/stickynotes_applet_callbacks.c @@ -401,7 +401,7 @@ void menu_help_cb(GtkAction *action, StickyNotesApplet *applet) { GError *error = NULL; gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (applet->w_applet)), - "help:stickynotes_applet", + "help:mate-stickynotes_applet", gtk_get_current_event_time (), &error); if (error) { @@ -594,7 +594,7 @@ void preferences_response_cb(GtkWidget *dialog, gint response, gpointer data) if (response == GTK_RESPONSE_HELP) { GError *error = NULL; gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (dialog)), - "help:stickynotes_applet?stickynotes-advanced-settings", + "help:mate-stickynotes_applet/stickynotes-advanced-settings", gtk_get_current_event_time (), &error); if (error) { diff --git a/trashapplet/src/trashapplet.c b/trashapplet/src/trashapplet.c index 65964cda..53b657d6 100644 --- a/trashapplet/src/trashapplet.c +++ b/trashapplet/src/trashapplet.c @@ -403,7 +403,7 @@ trash_applet_show_help (GtkAction *action, /* FIXME - Actually, we need a user guide */ gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (applet)), - "help:trashapplet", + "help:mate-trashapplet", gtk_get_current_event_time (), &err); -- cgit v1.2.1 From 359d9de7cf52263e1bf450e0315662ab537d0fc5 Mon Sep 17 00:00:00 2001 From: Stefano Karapetsas Date: Wed, 5 Feb 2014 15:14:46 +0100 Subject: command: Add GTK3 support --- command/command.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/command/command.c b/command/command.c index f32686da..dc27ea62 100644 --- a/command/command.c +++ b/command/command.c @@ -163,7 +163,7 @@ command_settings_callback (GtkAction *action, CommandApplet *command_applet) GTK_EXPAND | GTK_FILL | GTK_SHRINK, GTK_FILL, 0, 0); - gtk_box_pack_start_defaults (GTK_BOX (dialog->vbox), table); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (dialog)), table, TRUE, TRUE, 0); g_signal_connect (dialog, "response", G_CALLBACK (gtk_widget_destroy), dialog); -- cgit v1.2.1 From 91e9e9fe28c644349b63c03e7f18390e4f84ec65 Mon Sep 17 00:00:00 2001 From: Stefano Karapetsas Date: Wed, 5 Feb 2014 15:14:54 +0100 Subject: timerapplet: Add GTK3 support --- timerapplet/timerapplet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/timerapplet/timerapplet.c b/timerapplet/timerapplet.c index 8e64c14f..6a50e244 100644 --- a/timerapplet/timerapplet.c +++ b/timerapplet/timerapplet.c @@ -361,7 +361,7 @@ timer_preferences_callback (GtkAction *action, TimerApplet *applet) 0, 0); g_settings_bind (applet->settings, SHOW_DIALOG_KEY, widget, "active", G_SETTINGS_BIND_DEFAULT); - gtk_box_pack_start_defaults (GTK_BOX (dialog->vbox), GTK_WIDGET (table)); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (dialog)), GTK_WIDGET (table), TRUE, TRUE, 0); g_signal_connect (dialog, "response", G_CALLBACK (gtk_widget_destroy), dialog); -- cgit v1.2.1