From ab727faaba5bda62903006eaf21d6df97a4d4efe Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Mon, 29 Aug 2005 19:23:31 +0000 Subject: [PATCH] 2005-08-29 Dan Williams Patch from Dumitru Ciobarcianu * gnome/applet/applet.c - Define GTK_STOCK_INFO for GTK 2.6 and lower git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@908 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 18 ++++++++++++------ gnome/applet/applet.c | 6 ++++++ 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 97943c93f7..92ecfc2005 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,11 +1,17 @@ 2005-08-29 Dan Williams - * gnome/applet/* - - Don't use threads any more. Anything that blocks - (like gtk_dialog_run()) will have to get fixed up which - should happen quickly. We really only had threads to make - the animation smooth, and when everything got converted over - to DBus Pending Calls, the need for threads kind of went away + Patch from Dumitru Ciobarcianu + * gnome/applet/applet.c + - Define GTK_STOCK_INFO for GTK 2.6 and lower + +2005-08-29 Dan Williams + + * gnome/applet/* + - Don't use threads any more. Anything that blocks + (like gtk_dialog_run()) will have to get fixed up which + should happen quickly. We really only had threads to make + the animation smooth, and when everything got converted over + to DBus Pending Calls, the need for threads kind of went away 2005-08-29 Christopher Aillon diff --git a/gnome/applet/applet.c b/gnome/applet/applet.c index 2e6e087aa5..f250655bf4 100644 --- a/gnome/applet/applet.c +++ b/gnome/applet/applet.c @@ -77,6 +77,12 @@ #define GTK_STOCK_MEDIA_PAUSE GTK_STOCK_STOP #define GTK_STOCK_MEDIA_PLAY GTK_STOCK_REFRESH #define GTK_STOCK_ABOUT GTK_STOCK_DIALOG_INFO + #define GTK_STOCK_INFO GTK_STOCK_DIALOG_INFO +#endif + +/* Compat for GTK 2.6 */ +#if (GTK_MAJOR_VERSION <= 2 && GTK_MINOR_VERSION == 6) + #define GTK_STOCK_INFO GTK_STOCK_DIALOG_INFO #endif static GObject * nmwa_constructor (GType type, guint n_props, GObjectConstructParam *construct_props);