diff options
| author | Diego Escalante Urrelo <diegoe@src.gnome.org> | 2009-01-14 07:56:46 +0000 |
|---|---|---|
| committer | Diego Escalante Urrelo <diegoe@src.gnome.org> | 2009-01-14 07:56:46 +0000 |
| commit | 9ff406a623eecf6fc1897beb813023c0eac5ddda (patch) | |
| tree | fbafb8acb0772c5246d5f5cf1037087098488f9b /gweather | |
| parent | 71f4e302f725b80d41cf13e2308045501f2b79d9 (diff) | |
Drop gnome_help from gweather applet
svn path=/trunk/; revision=11193
Diffstat (limited to 'gweather')
| -rw-r--r-- | gweather/gweather-about.c | 2 | ||||
| -rw-r--r-- | gweather/gweather-applet.c | 10 | ||||
| -rw-r--r-- | gweather/gweather-dialog.c | 6 | ||||
| -rw-r--r-- | gweather/gweather-pref.c | 7 | ||||
| -rw-r--r-- | gweather/gweather.h | 1 | ||||
| -rw-r--r-- | gweather/main.c | 1 |
6 files changed, 12 insertions, 15 deletions
diff --git a/gweather/gweather-about.c b/gweather/gweather-about.c index 5bc7facba..eaa9cf63d 100644 --- a/gweather/gweather-about.c +++ b/gweather/gweather-about.c @@ -18,8 +18,6 @@ #include <stdlib.h> #include <assert.h> -#include <gnome.h> - #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE #include "gweather.h" diff --git a/gweather/gweather-applet.c b/gweather/gweather-applet.c index d3e9286d0..15d3a9b1d 100644 --- a/gweather/gweather-applet.c +++ b/gweather/gweather-applet.c @@ -19,11 +19,11 @@ #include <assert.h> #include <gconf/gconf-client.h> -#include <gnome.h> #include <panel-applet.h> -#include <libgnomeui/gnome-window-icon.h> #include <panel-applet-gconf.h> +#include <gdk/gdkkeysyms.h> + #ifdef HAVE_LIBNOTIFY #include <libnotify/notify.h> #include <libnotify/notification.h> @@ -59,9 +59,9 @@ static void help_cb (BonoboUIComponent *uic, { GError *error = NULL; - gnome_help_display_on_screen ( - "gweather", NULL, - gtk_widget_get_screen (GTK_WIDGET (gw_applet->applet)), + gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (gw_applet->applet)), + "ghelp:gweather", + gtk_get_current_event_time (), &error); if (error) { diff --git a/gweather/gweather-dialog.c b/gweather/gweather-dialog.c index 4f3ef9077..92c9bb63f 100644 --- a/gweather/gweather-dialog.c +++ b/gweather/gweather-dialog.c @@ -19,7 +19,6 @@ #include <assert.h> #include <gconf/gconf-client.h> -#include <gnome.h> #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE @@ -137,7 +136,10 @@ static void link_cb (GtkButton *button, gpointer data) { - gnome_url_show("http://www.weather.com/", NULL); + gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (button)), + "http://www.weather.com/", + gtk_get_current_event_time (), + NULL); } static gchar* diff --git a/gweather/gweather-pref.c b/gweather/gweather-pref.c index 5fe06717f..2c1bea13b 100644 --- a/gweather/gweather-pref.c +++ b/gweather/gweather-pref.c @@ -24,7 +24,6 @@ #include <ctype.h> #include <locale.h> -#include <gnome.h> #include <panel-applet.h> #include <gconf/gconf-client.h> @@ -735,9 +734,9 @@ static void help_cb (GtkDialog *dialog) { GError *error = NULL; - gnome_help_display_on_screen ( - "gweather", "gweather-settings", - gtk_window_get_screen (GTK_WINDOW (dialog)), + gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (dialog)), + "ghelp:gweather?gweather-settings", + gtk_get_current_event_time (), &error); if (error) { diff --git a/gweather/gweather.h b/gweather/gweather.h index e591b18db..69c7a5c27 100644 --- a/gweather/gweather.h +++ b/gweather/gweather.h @@ -11,7 +11,6 @@ * */ -#include <gnome.h> #include <panel-applet.h> #include <libgweather/gweather-gconf.h> diff --git a/gweather/main.c b/gweather/main.c index 789694d6b..538bb597a 100644 --- a/gweather/main.c +++ b/gweather/main.c @@ -12,7 +12,6 @@ # include <config.h> -#include <gnome.h> #include <panel-applet.h> #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE |