gnome-panel r11383 - trunk/libpanel-applet

[vuntz svn gnome org]

Author: vuntz
Date: Tue Dec  9 02:26:49 2008
New Revision: 11383
URL: http://svn.gnome.org/viewvc/gnome-panel?rev=11383&view=rev

Log:
2008-12-09  Vincent Untz  <vuntz gnome org>

	Stop using deprecated API (except for one bonobo API) and single
	include for glib/gtk+.

	* panel-applet-gconf.h: single include for glib
	* panel-applet.c: single include for gtk+
	(panel_applet_associate_schemas_in_dir):
	s/gconf_entry_free/gconf_entry_unref
	(panel_applet_can_focus), (panel_applet_focus):
	s/gtk_tooltips_data_get/gtk_widget_get_has_tooltip/. Sure, it'd be
	better to do both, but let's just say we don't like old applets with
	old code.
	(panel_applet_handle_background_string),
	(panel_applet_property_bag): do not mark strings that are not visible
	as translatable
	(panel_applet_update_background_for_widget):
	s/gtk_rc_style_unref/g_object_unref/
	* panel-applet.h: single include for glib/gtk+


Modified:
   trunk/libpanel-applet/ChangeLog
   trunk/libpanel-applet/panel-applet-gconf.h
   trunk/libpanel-applet/panel-applet.c
   trunk/libpanel-applet/panel-applet.h

Modified: trunk/libpanel-applet/panel-applet-gconf.h
==============================================================================
--- trunk/libpanel-applet/panel-applet-gconf.h	(original)
+++ trunk/libpanel-applet/panel-applet-gconf.h	Tue Dec  9 02:26:49 2008
@@ -25,8 +25,7 @@
 #ifndef __PANEL_APPLET_GCONF_H__
 #define __PANEL_APPLET_GCONF_H__
 
-#include <glib/gmacros.h>
-#include <glib/gerror.h>
+#include <glib.h>
 #include <gconf/gconf-value.h>
 
 #include <panel-applet.h>

Modified: trunk/libpanel-applet/panel-applet.c
==============================================================================
--- trunk/libpanel-applet/panel-applet.c	(original)
+++ trunk/libpanel-applet/panel-applet.c	Tue Dec  9 02:26:49 2008
@@ -29,13 +29,13 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
+
 #include <cairo.h>
 #include <cairo-xlib.h> //FIXME should be removed when gdk_cairo_set_source_pixmap() is available (GTK+ 2.10)
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkbindings.h>
-#include <gtk/gtktooltips.h>
+#include <gtk/gtk.h>
 #include <bonobo/bonobo-ui-util.h>
 #include <bonobo/bonobo-main.h>
 #include <bonobo/bonobo-types.h>
@@ -149,7 +149,7 @@
 
 		g_free (key);
 
-		gconf_entry_free (entry);
+		gconf_entry_unref (entry);
 
 		if (*error) {
 			g_slist_free (list);
@@ -663,7 +663,7 @@
 	 * A PanelApplet widget can focus if it has a tooltip or it does 
 	 * not have any focusable children.
 	 */
-	if (gtk_tooltips_data_get (widget))
+	if (gtk_widget_get_has_tooltip (widget))
 		return TRUE;
 
 	if (!PANEL_IS_APPLET (widget))
@@ -860,8 +860,8 @@
 	}
 
 	previous_focus_child = GTK_CONTAINER (widget)->focus_child;
-	 if (!previous_focus_child && !GTK_WIDGET_HAS_FOCUS (widget)) {
-		if (gtk_tooltips_data_get (widget)) {
+	if (!previous_focus_child && !GTK_WIDGET_HAS_FOCUS (widget)) {
+		if (gtk_widget_get_has_tooltip (widget)) {
 			GTK_WIDGET_SET_FLAGS (widget, GTK_CAN_FOCUS);
 			gtk_widget_grab_focus (widget);
 			GTK_WIDGET_UNSET_FLAGS (widget, GTK_CAN_FOCUS);
@@ -869,11 +869,12 @@
 		}
 	}
 	ret = GTK_WIDGET_CLASS (panel_applet_parent_class)->focus (widget, dir);
+
 	if (!ret && !previous_focus_child) {
  		if (!GTK_WIDGET_HAS_FOCUS (widget))  {
 			/*
 			 * Applet does not have a widget which can focus so set
-			 * the focus on the applet unless it aleready had focus
+			 * the focus on the applet unless it already had focus
 			 * because it had a tooltip.
 			 */ 
 			GTK_WIDGET_SET_FLAGS (widget, GTK_CAN_FOCUS);
@@ -1049,7 +1050,7 @@
 
 		if (!elements [1] || !panel_applet_parse_color (elements [1], color)) {
 
-			g_warning (_("Incomplete '%s' background type received"), elements [0]);
+			g_warning ("Incomplete '%s' background type received", elements [0]);
 			g_strfreev (elements);
 			return PANEL_NO_BACKGROUND;
 		}
@@ -1063,7 +1064,7 @@
 		g_return_val_if_fail (pixmap != NULL, PANEL_NO_BACKGROUND);
 
 		if (!panel_applet_parse_pixmap_str (elements [1], &pixmap_id, &x, &y)) {
-			g_warning (_("Incomplete '%s' background type received: %s"),
+			g_warning ("Incomplete '%s' background type received: %s",
 				   elements [0], elements [1]);
 
 			g_strfreev (elements);
@@ -1072,14 +1073,14 @@
 
 		*pixmap = panel_applet_get_pixmap (applet, pixmap_id, x, y);
 		if (!*pixmap) {
-			g_warning (_("Failed to get pixmap %s"), elements [1]);
+			g_warning ("Failed to get pixmap %s", elements [1]);
 			g_strfreev (elements);
 			return PANEL_NO_BACKGROUND;
 		}
 
 		retval = PANEL_PIXMAP_BACKGROUND;
 	} else
-		g_warning (_("Unknown background type received"));
+		g_warning ("Unknown background type received");
 
 	g_strfreev (elements);
 
@@ -1160,7 +1161,7 @@
 	gtk_widget_set_style (widget, NULL);
 	rc_style = gtk_rc_style_new ();
 	gtk_widget_modify_style (widget, rc_style);
-	gtk_rc_style_unref (rc_style);
+	g_object_unref (rc_style);
 
 	switch (type) {
 	case PANEL_NO_BACKGROUND:
@@ -1303,7 +1304,7 @@
 				 PROPERTY_ORIENT_IDX,
 				 BONOBO_ARG_SHORT,
 				 NULL,
-				 _("The Applet's containing Panel's orientation"),
+				 "The Applet's containing Panel's orientation",
 				 Bonobo_PROPERTY_READABLE | Bonobo_PROPERTY_WRITEABLE);
 
 	bonobo_property_bag_add (sack,
@@ -1311,7 +1312,7 @@
 				 PROPERTY_SIZE_IDX,
 				 BONOBO_ARG_SHORT,
 				 NULL,
-				 _("The Applet's containing Panel's size in pixels"),
+				 "The Applet's containing Panel's size in pixels",
 				 Bonobo_PROPERTY_READABLE | Bonobo_PROPERTY_WRITEABLE);
 
 	bonobo_property_bag_add (sack,
@@ -1319,7 +1320,7 @@
 				 PROPERTY_BACKGROUND_IDX,
 				 BONOBO_ARG_STRING,
 				 NULL,
-				 _("The Applet's containing Panel's background color or pixmap"),
+				 "The Applet's containing Panel's background color or pixmap",
 				 Bonobo_PROPERTY_READABLE | Bonobo_PROPERTY_WRITEABLE);
 
 	bonobo_property_bag_add (sack,
@@ -1327,7 +1328,7 @@
 				 PROPERTY_FLAGS_IDX,
 				 BONOBO_ARG_SHORT,
 				 NULL,
-				 _("The Applet's flags"),
+				 "The Applet's flags",
 				 Bonobo_PROPERTY_READABLE);
 
 	bonobo_property_bag_add (sack,
@@ -1335,7 +1336,7 @@
 				 PROPERTY_SIZE_HINTS_IDX,
 				 TC_CORBA_sequence_CORBA_long,
 				 NULL,
-				 _("Ranges that hint what sizes are acceptable for the applet"),
+				 "Ranges that hint what sizes are acceptable for the applet",
 				 Bonobo_PROPERTY_READABLE);
 
 	bonobo_property_bag_add (sack,
@@ -1343,7 +1344,7 @@
 				 PROPERTY_LOCKED_DOWN_IDX,
 				 BONOBO_ARG_BOOLEAN,
 				 NULL,
-				 _("The Applet's containing Panel is locked down"),
+				 "The Applet's containing Panel is locked down",
 				 Bonobo_PROPERTY_READABLE | Bonobo_PROPERTY_WRITEABLE);
 
 	return sack;

Modified: trunk/libpanel-applet/panel-applet.h
==============================================================================
--- trunk/libpanel-applet/panel-applet.h	(original)
+++ trunk/libpanel-applet/panel-applet.h	Tue Dec  9 02:26:49 2008
@@ -25,9 +25,8 @@
 #ifndef __PANEL_APPLET_H__
 #define __PANEL_APPLET_H__
 
-#include <glib/gmacros.h>
-#include <gtk/gtkenums.h>
-#include <gtk/gtkeventbox.h>
+#include <glib.h>
+#include <gtk/gtk.h>
 #include <libgnomeui/gnome-ui-init.h>
 #include <libgnomeui/gnome-client.h>
 #include <bonobo/bonobo-control.h>