[Galago-commits] r1993 - in trunk/xfce4-galago: . src

[galago-commits at freedesktop.org]

Author: grim
Date: 2005-06-25 19:52:35 -0700 (Sat, 25 Jun 2005)
New Revision: 1993

Modified:
   trunk/xfce4-galago/ChangeLog
   trunk/xfce4-galago/src/xfce_galago.c
Log:
Plugged a memory leak
Added XFCE_GALAGO casting macro


Modified: trunk/xfce4-galago/ChangeLog
===================================================================
--- trunk/xfce4-galago/ChangeLog	2005-06-26 02:19:37 UTC (rev 1992)
+++ trunk/xfce4-galago/ChangeLog	2005-06-26 02:52:35 UTC (rev 1993)
@@ -1,3 +1,8 @@
+Sat Jun 25 21:51:00 CDT 2005  Gary Kramlich <grim at reaperworld.com>
+
+	* Plugged a memory leak
+	* Added XFCE_GALAGO casting macro
+
 Sat Jun 25 21:19:00 CDT 2005  Gary Kramlich <grim at reaperworld.com>
 
 	* Icon sizes no map to the size of the panel

Modified: trunk/xfce4-galago/src/xfce_galago.c
===================================================================
--- trunk/xfce4-galago/src/xfce_galago.c	2005-06-26 02:19:37 UTC (rev 1992)
+++ trunk/xfce4-galago/src/xfce_galago.c	2005-06-26 02:52:35 UTC (rev 1993)
@@ -34,7 +34,8 @@
 #include <panel/xfce.h>
 
 /* some helper macros */
-#define XG_NAME			"xfce-galago"
+#define XG_NAME				"xfce-galago"
+#define XFCE_GALAGO(obj)	((XfceGalago *)(obj))
 
 /******************************************************************************
  * Xfce Galago Stuff
@@ -142,20 +143,26 @@
 
 static void
 xfce_galago_free(Control *control) {
+	XfceGalago *xg = XFCE_GALAGO(control->data);
+
+	g_return_if_fail(xg);
+
+	g_free(xg);
+	xg = NULL;
 }
 
 static void
 xfce_galago_attach_callback(Control *control, const gchar *signal,
 							GCallback callback, gpointer data)
 {
-	XfceGalago *xg = control->data;
+	XfceGalago *xg = XFCE_GALAGO(control->data);
 
-    g_signal_connect (xg->label, signal, callback, data);
+    g_signal_connect (xg->ebox, signal, callback, data);
 }
 
 static void
 xfce_galago_set_size(Control *control, gint size) {
-	XfceGalago *xg = control->data;
+	XfceGalago *xg = XFCE_GALAGO(control->data);
 	GtkIconSize gtk_size = GTK_ICON_SIZE_INVALID;
 
 	switch(size) {