gnome-applets r11220 - in trunk: . accessx-status charpick gweather modemlights

[callum svn gnome org]

Author: callum
Date: Sun Jan 25 23:43:11 2009
New Revision: 11220
URL: http://svn.gnome.org/viewvc/gnome-applets?rev=11220&view=rev

Log:
We finally pass GTK_DISABLE_DEPRECATED

Modified:
   trunk/ChangeLog
   trunk/accessx-status/ChangeLog
   trunk/accessx-status/applet.c
   trunk/charpick/ChangeLog
   trunk/charpick/charpick.c
   trunk/configure.in
   trunk/gweather/ChangeLog
   trunk/gweather/Makefile.am
   trunk/gweather/gweather-applet.c
   trunk/gweather/main.c
   trunk/modemlights/ChangeLog
   trunk/modemlights/modem-applet.c

Modified: trunk/accessx-status/applet.c
==============================================================================
--- trunk/accessx-status/applet.c	(original)
+++ trunk/accessx-status/applet.c	Sun Jan 25 23:43:11 2009
@@ -411,7 +411,7 @@
 	g_object_unref (layout);
 	glyph_pixbuf = gdk_pixbuf_get_from_drawable (NULL, pixmap, 
 						     cmap, 0, 0, 0, 0, w, h);
-	gdk_pixmap_unref (pixmap);
+	g_object_unref (pixmap);
 	alpha_pixbuf = gdk_pixbuf_add_alpha (glyph_pixbuf, TRUE, bg->red >> 8, bg->green >> 8, bg->blue >> 8);
 	g_object_unref (G_OBJECT (glyph_pixbuf));
 	g_object_unref (G_OBJECT (cmap));

Modified: trunk/charpick/charpick.c
==============================================================================
--- trunk/charpick/charpick.c	(original)
+++ trunk/charpick/charpick.c	Sun Jan 25 23:43:11 2009
@@ -147,7 +147,7 @@
   charpick_data *curr_data = data;
   
   if (curr_data->last_toggle_button)
-    gtk_toggle_button_set_state (curr_data->last_toggle_button, FALSE);
+    gtk_toggle_button_set_active (curr_data->last_toggle_button, FALSE);
 
   curr_data->last_toggle_button = NULL;
   return TRUE;
@@ -309,7 +309,7 @@
 	while (list) {
 		gchar *string = list->data;
 		menuitem = gtk_radio_menu_item_new_with_label (group, string);
-		group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (menuitem));
+		group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menuitem));
 		gtk_widget_show (menuitem);
 		g_object_set_data (G_OBJECT (menuitem), "string", string);
 		g_signal_connect (G_OBJECT (menuitem), "activate",
@@ -494,10 +494,10 @@
     g_object_set_data (G_OBJECT (toggle_button[i]), "unichar", 
 				GINT_TO_POINTER(g_utf8_get_char (label)));
     g_signal_connect (GTK_OBJECT (toggle_button[i]), "toggled",
-                        (GtkSignalFunc) toggle_button_toggled_cb,
+		      G_CALLBACK (toggle_button_toggled_cb),
                         p_curr_data);
     g_signal_connect (GTK_OBJECT (toggle_button[i]), "button_press_event", 
-                        (GtkSignalFunc) button_press_hack, p_curr_data->applet);
+                      G_CALLBACK (button_press_hack), p_curr_data->applet);
   }
   
   if (p_curr_data->panel_vertical) {
@@ -795,10 +795,10 @@
                             utf8_atom,
 			    0);
   g_signal_connect (GTK_OBJECT (curr_data->applet), "selection_get",
-		      GTK_SIGNAL_FUNC (charpick_selection_handler),
+		      G_CALLBACK (charpick_selection_handler),
 		      curr_data);
   g_signal_connect (GTK_OBJECT (curr_data->applet), "selection_clear_event",
-		      GTK_SIGNAL_FUNC (selection_clear_cb),
+		      G_CALLBACK (selection_clear_cb),
 		      curr_data);
  
   make_applet_accessible (GTK_WIDGET (applet));

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sun Jan 25 23:43:11 2009
@@ -504,22 +504,25 @@
 dnl ***************************************************************************
 
 SU_TOOL=
-P_MODEMLIGHTS=
 HAVE_LIBUTIL=
 
 AC_PATH_PROG(SU_TOOL, su)
 AC_CHECK_LIB(util, forkpty, HAVE_LIBUTIL=true, HAVE_LIBUTIL=false)
 
-if test "x$HAVE_LIBUTIL" = "xtrue" -a "x$P_MODEMLIGHTS" = "xmodemlights" -a "x$HAVE_GNOME_SETTINGS_DAEMON" = "xyes"; then
-  MODEMLIGHTS_LIBS=" -lutil"
-  AC_SUBST(MODEMLIGHTS_LIBS)
-  AC_DEFINE_UNQUOTED(STB_SCRIPTS_DIR, "$STB_SCRIPTS_DIR", [System tools backends])
-  AC_DEFINE_UNQUOTED(SU_PATH, "${SU_TOOL}", [su executable path])
-  BUILD_MODEM_LIGHTS=yes
-else
+dnl ***
+dnl *** Modem lights does not currently compile. It needs to be ported to a
+dnl *** modern gnome-system-tools backend.
+dnl ***
+dnl if test "x$HAVE_LIBUTIL" = "xtrue" -a "x$HAVE_GNOME_SETTINGS_DAEMON" = "xyes"; then
+dnl   MODEMLIGHTS_LIBS=" -lutil"
+dnl   AC_SUBST(MODEMLIGHTS_LIBS)
+dnl   AC_DEFINE_UNQUOTED(STB_SCRIPTS_DIR, "$STB_SCRIPTS_DIR", [System tools backends])
+dnl   AC_DEFINE_UNQUOTED(SU_PATH, "${SU_TOOL}", [su executable path])
+dnl   BUILD_MODEM_LIGHTS=yes
+dnl else
   AC_MSG_WARN([*** modemlights applet will not be built ***])
   BUILD_MODEM_LIGHTS=no
-fi
+dnl fi
 
 AM_CONDITIONAL(APPLET_MODEMLIGHTS, test "x$BUILD_MODEM_LIGHTS" = "xyes")
 

Modified: trunk/gweather/Makefile.am
==============================================================================
--- trunk/gweather/Makefile.am	(original)
+++ trunk/gweather/Makefile.am	Sun Jan 25 23:43:11 2009
@@ -5,7 +5,6 @@
 INCLUDES =				\
 	-I$(srcdir)			\
 	-I$(top_srcdir)			\
-	-DGTK_ENABLE_BROKEN		\
 	$(GNOME_APPLETS_CFLAGS)		\
 	$(GNOME_LIBS2_CFLAGS)		\
 	$(LIBNOTIFY_CFLAGS)		\

Modified: trunk/gweather/gweather-applet.c
==============================================================================
--- trunk/gweather/gweather-applet.c	(original)
+++ trunk/gweather/gweather-applet.c	Sun Jan 25 23:43:11 2009
@@ -332,7 +332,7 @@
     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);
                      

Modified: trunk/gweather/main.c
==============================================================================
--- trunk/gweather/main.c	(original)
+++ trunk/gweather/main.c	Sun Jan 25 23:43:11 2009
@@ -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

Modified: trunk/modemlights/modem-applet.c
==============================================================================
--- trunk/modemlights/modem-applet.c	(original)
+++ trunk/modemlights/modem-applet.c	Sun Jan 25 23:43:11 2009
@@ -28,9 +28,11 @@
 #include <pty.h>
 #endif
 #include <sys/poll.h>
+#include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <libxml/tree.h>
+#include <errno.h>
 
 #ifdef __FreeBSD__
 #include <sys/ioctl.h>
@@ -1033,7 +1035,7 @@
   gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (applet)),
 		"ghelp:modemlights",
 		gtk_get_current_event_time (),
-		&error);
+		NULL);
 }
 
 static gboolean