ekiga r6398 - trunk/src/gui

[jpuydt svn gnome org]

Author: jpuydt
Date: Fri Jun 27 18:06:45 2008
New Revision: 6398
URL: http://svn.gnome.org/viewvc/ekiga?rev=6398&view=rev

Log:
Fixed leaks

Modified:
   trunk/src/gui/statusicon.cpp

Modified: trunk/src/gui/statusicon.cpp
==============================================================================
--- trunk/src/gui/statusicon.cpp	(original)
+++ trunk/src/gui/statusicon.cpp	Fri Jun 27 18:06:45 2008
@@ -64,7 +64,7 @@
 /*
  * The StatusIcon
  */
-struct _StatusIconPrivate 
+struct _StatusIconPrivate
 {
   _StatusIconPrivate (Ekiga::ServiceCore & _core) : core (_core) { }
 
@@ -89,8 +89,8 @@
 static GObjectClass *parent_class = NULL;
 
 
-/* 
- * Declaration of Callbacks 
+/*
+ * Declaration of Callbacks
  */
 static void
 show_popup_menu_cb (GtkStatusIcon *icon,
@@ -102,7 +102,7 @@
 statusicon_activated_cb (GtkStatusIcon *icon,
                          gpointer data);
 
-static void 
+static void
 message_event_cb (GtkWidget *widget,
                   guint messages,
                   gpointer data);
@@ -111,7 +111,7 @@
 statusicon_blink_cb (gpointer data);
 
 static void
-statusicon_key_updated_cb (gpointer id, 
+statusicon_key_updated_cb (gpointer id,
                            GmConfEntry *entry,
                            gpointer data);
 
@@ -134,7 +134,7 @@
                        guint status);
 
 
-/* 
+/*
  * GObject stuff
  */
 static void
@@ -144,8 +144,22 @@
 
   icon = STATUSICON (obj);
 
-  icon->priv->blink_image = NULL;
-  icon->priv->key = NULL;
+  if (icon->priv->popup_menu) {
+
+    g_object_unref (icon->priv->popup_menu);
+    icon->priv->popup_menu = NULL;
+  }
+
+  if (icon->priv->blink_image) {
+
+    g_free (icon->priv->blink_image);
+    icon->priv->blink_image = NULL;
+  }
+  if (icon->priv->key) {
+
+    g_free (icon->priv->key);
+    icon->priv->key = NULL;
+  }
 
   parent_class->dispose (obj);
 }
@@ -158,7 +172,7 @@
 
   self = STATUSICON (obj);
 
-  if (self->priv->blink_image) 
+  if (self->priv->blink_image)
     g_free (self->priv->blink_image);
 
   if (self->priv->key)
@@ -168,7 +182,7 @@
        iter != self->priv->connections.end ();
        iter++)
     iter->disconnect ();
-  
+
   parent_class->finalize (obj);
 }
 
@@ -241,9 +255,9 @@
   gobject_class->get_property = statusicon_get_property;
   gobject_class->set_property = statusicon_set_property;
 
-  spec = g_param_spec_string ("key", "Key", "Key", 
+  spec = g_param_spec_string ("key", "Key", "Key",
                               NULL, (GParamFlags) G_PARAM_READWRITE);
-  g_object_class_install_property (gobject_class, STATUSICON_KEY, spec); 
+  g_object_class_install_property (gobject_class, STATUSICON_KEY, spec);
 }
 
 
@@ -306,9 +320,9 @@
   StatusIcon *self = STATUSICON (data);
 
   GtkWidget *window = NULL;
-  
+
   if (!self->priv->unread_messages) {
-  
+
     window = GnomeMeeting::Process ()->GetMainWindow (); //FIXME
 
     // FIXME when the main window becomes a gobject
@@ -328,7 +342,7 @@
 }
 
 
-static void 
+static void
 message_event_cb (G_GNUC_UNUSED GtkWidget *widget,
                   guint messages,
                   gpointer data)
@@ -337,9 +351,9 @@
 
   gchar *message = NULL;
 
-  if (messages > 0) 
+  if (messages > 0)
     statusicon_start_blinking (self, GM_STOCK_MESSAGE);
-  else 
+  else
     statusicon_stop_blinking (self);
 
   if (messages > 0) {
@@ -347,7 +361,7 @@
     message = g_strdup_printf (ngettext ("You have %d message",
 					 "You have %d messages",
 					 messages), messages);
-    
+
     gtk_status_icon_set_tooltip (GTK_STATUS_ICON (self), message);
 
     g_free (message);
@@ -367,9 +381,9 @@
   StatusIcon *statusicon = STATUSICON (data);
 
   gdk_threads_enter ();
-  if (statusicon->priv->blinking) 
+  if (statusicon->priv->blinking)
     gtk_status_icon_set_from_stock (GTK_STATUS_ICON (statusicon), statusicon->priv->blink_image);
-  else  
+  else
     statusicon_set_status (statusicon, statusicon->priv->status);
   gdk_threads_leave ();
 
@@ -398,7 +412,7 @@
 }
 
 
-/* 
+/*
  * Local functions
  */
 static GtkWidget *
@@ -478,7 +492,7 @@
     icon->priv->blinking = false;
   }
 
-  statusicon_set_status (STATUSICON (icon), 
+  statusicon_set_status (STATUSICON (icon),
                          gm_conf_get_int (icon->priv->key));
 }