summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Jon McCann <jmccann@redhat.com>2010-06-24 02:19:07 -0400
committerWilliam Jon McCann <jmccann@redhat.com>2010-06-24 02:19:07 -0400
commit23d7fc296a9ee606db49f7d280b3bbfcf6971f89 (patch)
treebf882dd3494323ea4e81e1f1d2c32b248ba86c76
parent87ced33981aaf677755c919683f08a19f09aabd9 (diff)
downloadlibnotify-23d7fc296a9ee606db49f7d280b3bbfcf6971f89.tar.gz
Don't leak an error
-rw-r--r--libnotify/notify.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/libnotify/notify.c b/libnotify/notify.c
index 4cd8c2d..eaa0205 100644
--- a/libnotify/notify.c
+++ b/libnotify/notify.c
@@ -182,7 +182,6 @@ _notify_get_g_proxy (void)
/* lazily initialize D-Bus connection */
error = NULL;
bus = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
-
if (error != NULL) {
g_error_free (error);
return NULL;
@@ -295,7 +294,7 @@ notify_get_server_info (char **ret_name,
char **ret_version,
char **ret_spec_version)
{
- GError *error = NULL;
+ GError *error;
DBusGProxy *proxy;
char *name;
char *vendor;
@@ -307,6 +306,7 @@ notify_get_server_info (char **ret_name,
return FALSE;
}
+ error = NULL;
if (!dbus_g_proxy_call (proxy,
"GetServerInformation",
&error,
@@ -316,6 +316,7 @@ notify_get_server_info (char **ret_name,
G_TYPE_STRING, &version,
G_TYPE_STRING, &spec_version,
G_TYPE_INVALID)) {
+ g_error_free (error);
return FALSE;
}