diff options
| author | Callum McKenzie <callum@src.gnome.org> | 2009-01-25 23:43:11 +0000 |
|---|---|---|
| committer | Callum McKenzie <callum@src.gnome.org> | 2009-01-25 23:43:11 +0000 |
| commit | 5a8061808eca58e4b0900c27abfbe15710d92159 (patch) | |
| tree | 7b3bce27d083eadaf5cd38bca92654ef705442c6 /gweather | |
| parent | c391ca5210f9a1f8ff55af30b7902736fef584c0 (diff) | |
We finally pass GTK_DISABLE_DEPRECATED
svn path=/trunk/; revision=11220
Diffstat (limited to 'gweather')
| -rw-r--r-- | gweather/ChangeLog | 9 | ||||
| -rw-r--r-- | gweather/Makefile.am | 1 | ||||
| -rw-r--r-- | gweather/gweather-applet.c | 2 | ||||
| -rw-r--r-- | gweather/main.c | 5 |
4 files changed, 13 insertions, 4 deletions
diff --git a/gweather/ChangeLog b/gweather/ChangeLog index 906f7f257..66190b507 100644 --- a/gweather/ChangeLog +++ b/gweather/ChangeLog @@ -1,3 +1,12 @@ +2009-01-26 Callum McKenzie <callum@spooky-possum.org> + + * Makefile.am (INCLUDES): Remove -DENABLE_BROKEN. We don't need it + and it prevents us building with GTK_DISABLE_DEPRECATED. + + * main.c: + * gweather-applet.c: Deprecated symbol removal. Patch from Maxim + Ermilov, see bug 562520. + ==================== 2.25.3 ====================== ==================== 2.25.2 ====================== diff --git a/gweather/Makefile.am b/gweather/Makefile.am index d571554aa..832b02b4e 100644 --- a/gweather/Makefile.am +++ b/gweather/Makefile.am @@ -5,7 +5,6 @@ SUBDIRS = docs INCLUDES = \ -I$(srcdir) \ -I$(top_srcdir) \ - -DGTK_ENABLE_BROKEN \ $(GNOME_APPLETS_CFLAGS) \ $(GNOME_LIBS2_CFLAGS) \ $(LIBNOTIFY_CFLAGS) \ diff --git a/gweather/gweather-applet.c b/gweather/gweather-applet.c index 15d3a9b1d..4730bb651 100644 --- a/gweather/gweather-applet.c +++ b/gweather/gweather-applet.c @@ -332,7 +332,7 @@ void gweather_applet_create (GWeatherApplet *gw_applet) g_signal_connect (G_OBJECT(gw_applet->applet), "destroy", G_CALLBACK (applet_destroy), gw_applet); g_signal_connect (GTK_OBJECT(gw_applet->applet), "button_press_event", - GTK_SIGNAL_FUNC(clicked_cb), gw_applet); + G_CALLBACK(clicked_cb), gw_applet); g_signal_connect (G_OBJECT(gw_applet->applet), "key_press_event", G_CALLBACK(key_press_cb), gw_applet); diff --git a/gweather/main.c b/gweather/main.c index 538bb597a..74bfa0177 100644 --- a/gweather/main.c +++ b/gweather/main.c @@ -10,8 +10,9 @@ * */ -# include <config.h> - +#include <glib.h> +#include <config.h> +#include <gtk/gtk.h> #include <panel-applet.h> #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE |