gedit r6529 - in branches/new_plugins/gedit: . dbus

[jessevdk svn gnome org]

Author: jessevdk
Date: Thu Sep 11 18:26:54 2008
New Revision: 6529
URL: http://svn.gnome.org/viewvc/gedit?rev=6529&view=rev

Log:
Fixed few unharmful memleaks


Modified:
   branches/new_plugins/gedit/dbus/gedit-dbus.c
   branches/new_plugins/gedit/gedit.c

Modified: branches/new_plugins/gedit/dbus/gedit-dbus.c
==============================================================================
--- branches/new_plugins/gedit/dbus/gedit-dbus.c	(original)
+++ branches/new_plugins/gedit/dbus/gedit-dbus.c	Thu Sep 11 18:26:54 2008
@@ -126,12 +126,14 @@
 			  	G_TYPE_UINT, &request_name_result,
 			  	G_TYPE_INVALID))
 	{
+		g_object_unref (bus_proxy);
 		return FALSE;
 	}
 	
 	if (request_name_result == DBUS_REQUEST_NAME_REPLY_EXISTS)
 	{
 		/* there is already a master gedit process */
+		g_object_unref (bus_proxy);
 		return FALSE;
 	}
 
@@ -142,8 +144,7 @@
 	bus = gedit_message_bus_get_default ();
 	g_signal_connect (bus, "dispatch", G_CALLBACK (on_dispatch_message), gbus);
 	
-	/* TODO: disconnect/reconnect signal when we maybe lose ownership, or
-	   bus goes down? */
+	g_object_unref (bus_proxy);
 	
 	return TRUE;
 }

Modified: branches/new_plugins/gedit/gedit.c
==============================================================================
--- branches/new_plugins/gedit/gedit.c	(original)
+++ branches/new_plugins/gedit/gedit.c	Thu Sep 11 18:26:54 2008
@@ -360,6 +360,8 @@
 				/* dispatch complete, we can safely exit now */
 				gdk_notify_startup_complete ();
 
+				g_free (encoding_charset);
+				g_strfreev (remaining_args);
 				exit(0);
 			}
 		}
@@ -448,6 +450,9 @@
 	g_object_unref (engine);
 	gedit_prefs_manager_app_shutdown ();
 	gedit_metadata_manager_shutdown ();
+	
+	g_free (encoding_charset);
+	g_strfreev (remaining_args);
 
 	return 0;
 }