quick-lounge-applet r253 - in trunk: . src

[paobac svn gnome org]

Author: paobac
Date: Tue Feb  3 17:13:53 2009
New Revision: 253
URL: http://svn.gnome.org/viewvc/quick-lounge-applet?rev=253&view=rev

Log:
2009-02-03  Paolo Bacchilega  <paobac svn gnome org>

	* configure.ac: changed version to 2.13.1
	
	* src/quick-lounge.c: 
	* src/quick-box.h: 
	* src/quick-box.c: 
	
	register the applet to the theme_changed signal instead of 
	the quick_box.


Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/src/quick-box.c
   trunk/src/quick-box.h
   trunk/src/quick-lounge.c

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Tue Feb  3 17:13:53 2009
@@ -1,4 +1,4 @@
-AC_INIT([quick-lounge-applet],[2.13.0],[http://bugzilla.gnome.org/enter_bug.cgi?product=quick-lounge-applet])
+AC_INIT([quick-lounge-applet],[2.13.1],[http://bugzilla.gnome.org/enter_bug.cgi?product=quick-lounge-applet])
 
 GNOME_COMMON_INIT
 

Modified: trunk/src/quick-box.c
==============================================================================
--- trunk/src/quick-box.c	(original)
+++ trunk/src/quick-box.c	Tue Feb  3 17:13:53 2009
@@ -1571,12 +1571,13 @@
 }
 
 
-static void
-icon_theme_changed (GtkIconTheme  *icon_theme,
-		    QuickBox       *quick_box)
+void
+quick_box_icon_theme_changed (QuickBox *quick_box)
 {
+	int    child_size;
 	GList *children, *scan;
-	int    child_size = get_child_size (quick_box);
+	
+	child_size = get_child_size (quick_box);
 
 	children = gtk_container_get_children (GTK_CONTAINER (quick_box));
 	for (scan = children; scan; scan = scan->next) {
@@ -1735,10 +1736,6 @@
 			  "drag_leave",
 			  G_CALLBACK (drag_leave), 
 			  quick_box);
-	g_signal_connect (G_OBJECT (quick_box->priv->icon_theme),
-			  "changed",
-			  G_CALLBACK (icon_theme_changed),
-			  quick_box);
 
 	return GTK_WIDGET (quick_box);
 }

Modified: trunk/src/quick-box.h
==============================================================================
--- trunk/src/quick-box.h	(original)
+++ trunk/src/quick-box.h	Tue Feb  3 17:13:53 2009
@@ -29,6 +29,10 @@
 #include "quick-button.h"
 #include "quick-separator.h"
 
+typedef void (*PopulateMenuFunc) (GtkWidget *popup_menu, 
+				  GtkWidget *button,
+				  gpointer   data);
+
 #define QUICK_TYPE_BOX            (quick_box_get_type ())
 #define QUICK_BOX(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), QUICK_TYPE_BOX, QuickBox))
 #define QUICK_BOX_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), QUICK_TYPE_BOX, QuickBoxClass))
@@ -50,64 +54,43 @@
 };
 
 GType               quick_box_get_type             (void);
-
 GtkWidget          *quick_box_new                  (PanelAppletOrient  orient,
 						    int                size,
 						    GtkIconTheme      *icon_theme);
-
 void                quick_box_set_orient           (QuickBox          *qbox, 
 						    PanelAppletOrient  orient);
-
 PanelAppletOrient   quick_box_get_orient           (QuickBox          *qbox);
-
 void                quick_box_set_size             (QuickBox          *qbox, 
 						    int                size);
-
 int                 quick_box_get_size             (QuickBox          *qbox);
-
 void                quick_box_set_min_visible_cols (QuickBox          *qbox,
 						    int                cols);
-
 int                 quick_box_get_min_visible_cols (QuickBox          *qbox);
-
 void                quick_box_set_max_visible_cols (QuickBox          *qbox,
 						    int                cols);
-
 int                 quick_box_get_max_visible_cols (QuickBox          *qbox);
-
 void		    quick_box_set_rows		   (QuickBox	      *qbox,
 						    int 	       rows);
-
 int                 quick_box_get_rows             (QuickBox          *qbox);
-
 const int *         quick_box_get_size_hint_list   (QuickBox          *qbox,
 						    int               *n_elements);
-
 void                quick_box_reorder_child        (QuickBox          *qbox,
 						    GtkWidget         *child,
 						    int                pos);
-
-typedef void (*PopulateMenuFunc) (GtkWidget *popup_menu, 
-				  GtkWidget *button,
-				  gpointer   data);
-
 void                quick_box_populate_menu_func   (QuickBox          *qbox,
 						    PopulateMenuFunc   pm_func,
 						    gpointer           data);
-
-int                 quick_box_get_pointer_position (QuickBox         *qbox, 
-						    int               x, 
-						    int               y);
-
+int                 quick_box_get_pointer_position (QuickBox          *qbox, 
+						    int                x, 
+						    int                y);
 GtkWidget          *quick_box_add_button           (QuickBox          *qbox,
 						    const char        *uri,
 						    int                pos);
-
 GtkWidget          *quick_box_add_separator        (QuickBox          *qbox,
 						    int                pos);
-
 void                quick_box_update_child         (QuickBox          *qbox,
 						    QuickButton       *child,
 						    GKeyFile          *desktop_entry);
+void                quick_box_icon_theme_changed   (QuickBox          *qbox);
 
 #endif /* QUICK_BOX_H */

Modified: trunk/src/quick-lounge.c
==============================================================================
--- trunk/src/quick-lounge.c	(original)
+++ trunk/src/quick-lounge.c	Tue Feb  3 17:13:53 2009
@@ -1315,6 +1315,14 @@
 }
 
 
+static void
+icon_theme_changed (GtkIconTheme *icon_theme,
+		    QuickLounge  *quick_lounge)
+{
+	quick_box_icon_theme_changed (quick_lounge->quick_box);
+}
+
+
 static gboolean
 quick_lounge_applet_fill (PanelApplet *applet)
 {
@@ -1365,7 +1373,6 @@
 	quick_box_set_max_visible_cols (quick_lounge->quick_box, max_size);
 	quick_box_set_rows (quick_lounge->quick_box, rows);
 
-
 	g_object_set_data (G_OBJECT (quick_lounge->quick_box),
 			   "quick_lounge",
 			   quick_lounge);
@@ -1383,6 +1390,10 @@
 			  "drag_data_received",
 			  G_CALLBACK (drag_data_received),
 			  quick_lounge);
+	g_signal_connect (G_OBJECT (quick_lounge->icon_theme),
+			  "changed",
+			  G_CALLBACK (icon_theme_changed),
+			  quick_lounge);
 
 	/**/