Remove GnomeProgram, not useful anymore, drop libgnome dependency. Fixes

2007-09-28  Xavier Claessens  <xclaesse@gmail.com>

	* configure.ac:
	* src/empathy.c: Remove GnomeProgram, not useful anymore, drop libgnome
	dependency. Fixes bug #442079

	* libempathy/empathy-avatar.c:
	* libempathy/empathy-avatar.h: Fix Copyright header.

	* libempathy/empathy-contact-factory.c:
	* libempathy/empathy-tp-group.c: Free return value for async DBus calls,
	they are not owned by dbus-glib. This fix big leaks, thanks again to
	valgrind.

svn path=/trunk/; revision=330

diff --git a/ChangeLog b/ChangeLog
index 46b70860f354fac4aaa9275cac3a43283dacc014..14932262f1b2e8fb9824b2265e0e37a714dad2fc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2007-09-28  Xavier Claessens  <xclaesse@gmail.com>
+
+       * configure.ac:
+       * src/empathy.c: Remove GnomeProgram, not useful anymore, drop libgnome
+       dependency. Fixes bug #442079
+
+       * libempathy/empathy-avatar.c:
+       * libempathy/empathy-avatar.h: Fix Copyright header.
+
+       * libempathy/empathy-contact-factory.c:
+       * libempathy/empathy-tp-group.c: Free return value for async DBus calls,
+       they are not owned by dbus-glib. This fix big leaks, thanks again to
+       valgrind.
+
 2007-09-28  Xavier Claessens  <xclaesse@gmail.com>
 
        * libempathy/empathy-tp-group.c: Look in the local_pendings list if a

diff --git a/configure.ac b/configure.ac
index 92f5def93fa61de27ead010a9b2a58980cc3ce5b..a24797c3849aa6119c38b9f3a44b5717d8471459 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -93,7 +93,6 @@ PKG_CHECK_MODULES(EMPATHY,
    libmissioncontrol >= $MISSION_CONTROL_REQUIRED
    gtk+-2.0 >= $GTK_REQUIRED
    libglade-2.0 >= $LIBGLADE_REQUIRED
-   libgnomeui-2.0
    libebook-1.2
 ])
 
@@ -239,7 +238,6 @@ if test "x$enable_python" != "xno"; then
          libmissioncontrol >= $MISSION_CONTROL_REQUIRED
          gtk+-2.0 >= $GTK_REQUIRED
          libglade-2.0 >= $LIBGLADE_REQUIRED
-         libgnomeui-2.0
       ], have_python="yes", have_python="no")
    fi
 else

diff --git a/libempathy/empathy-avatar.c b/libempathy/empathy-avatar.c
index fe4e613c614a41f8c337c2276bba9559a5fc7271..13667311094194710a94d3427c849bcd877e42e0 100644 (file)
--- a/libempathy/empathy-avatar.c
+++ b/libempathy/empathy-avatar.c
@@ -1,6 +1,7 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * Copyright (C) 2002-2007 Imendio AB
+ * Copyright (C) 2006 Xavier Claessens <xclaesse@gmail.com>
+ * Copyright (C) 2007 Collabora Ltd.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -17,8 +18,7 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  *
- * Authors: Martyn Russell <martyn@imendio.com>
- *          Xavier Claessens <xclaesse@gmail.com>
+ * Authors: Xavier Claessens <xclaesse@gmail.com>
  */
 
 #include "config.h"

diff --git a/libempathy/empathy-avatar.h b/libempathy/empathy-avatar.h
index b3d69a8fefa09a0e3998a1cedd1081e78a28ba90..390676a205ce594b448549de6c4ba367028bfa45 100644 (file)
--- a/libempathy/empathy-avatar.h
+++ b/libempathy/empathy-avatar.h
@@ -1,6 +1,7 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
  * Copyright (C) 2006 Xavier Claessens <xclaesse@gmail.com>
+ * Copyright (C) 2007 Collabora Ltd.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -16,6 +17,8 @@
  * License along with this program; if not, write to the
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
+ *
+ * Authors: Xavier Claessens <xclaesse@gmail.com>
  */
 
 #ifndef __EMPATHY_AVATAR_H__

diff --git a/libempathy/empathy-contact-factory.c b/libempathy/empathy-contact-factory.c
index e14914a1cd6362408160a648481e639405956289..8f5c51a5c98d176f12303adb4842ff433aa17a5c 100644 (file)
--- a/libempathy/empathy-contact-factory.c
+++ b/libempathy/empathy-contact-factory.c
@@ -213,6 +213,8 @@ contact_factory_get_presence_cb (DBusGProxy *proxy,
        g_hash_table_foreach (handle_table,
                              (GHFunc) contact_factory_parse_presence_foreach,
                              account_data);
+
+       g_hash_table_destroy (handle_table);
 OUT:
        contact_factory_account_data_return_call (account_data);
 }
@@ -229,8 +231,8 @@ contact_factory_presence_update_cb (DBusGProxy                *proxy,
 
 static void
 contact_factory_set_aliases_cb (DBusGProxy *proxy,
-                               GError *error,
-                               gpointer user_data)
+                               GError     *error,
+                               gpointer    user_data)
 {
        ContactFactoryAccountData *account_data = user_data;
 
@@ -276,6 +278,7 @@ contact_factory_request_aliases_cb (DBusGProxy  *proxy,
                i++;
        }
 
+       g_strfreev (contact_names);
 OUT:
        contact_factory_account_data_return_call (data->account_data);
        g_free (data->handles);
@@ -458,6 +461,7 @@ contact_factory_get_known_avatar_tokens_cb (DBusGProxy *proxy,
                                                             account_data);
        }
 
+       g_hash_table_destroy (tokens);
        g_array_free (data.handles, TRUE);
 OUT:
        contact_factory_account_data_return_call (account_data);
@@ -560,9 +564,11 @@ contact_factory_get_capabilities_cb (DBusGProxy *proxy,
                                                     channel_type,
                                                     generic,
                                                     specific);
-       }
 
+               g_value_array_free (values);
+       }
 
+       g_ptr_array_free (capabilities, TRUE);
 OUT:
        contact_factory_account_data_return_call (account_data);
 }
@@ -668,6 +674,7 @@ contact_factory_request_handles_cb (DBusGProxy *proxy,
        }
 
        contact_factory_request_everything (data->account_data, handles);
+       g_array_free (handles, TRUE);
 
 OUT:
        g_list_foreach (data->contacts, (GFunc) g_object_unref, NULL);

diff --git a/libempathy/empathy-tp-group.c b/libempathy/empathy-tp-group.c
index 1ba361d17302110ff7d2f45b1957da6d16254aaf..c4f7583e90bcfebe10d1df08838c455de7598ff5 100644 (file)
--- a/libempathy/empathy-tp-group.c
+++ b/libempathy/empathy-tp-group.c
@@ -370,6 +370,8 @@ tp_group_get_members_cb (DBusGProxy *proxy,
                                     0,       /* actor */
                                     0,       /* reason */
                                     group);
+
+       g_array_free (handles, TRUE);
 }
 
 static void
@@ -413,7 +415,10 @@ tp_group_get_local_pending_cb (DBusGProxy *proxy,
                                             actor_handle, /* actor */
                                             reason,       /* reason */
                                             group);
+
+               g_value_array_free (pending_struct);
        }
+       g_ptr_array_free (array, TRUE);
        g_array_free (handles, TRUE);
 }
 
@@ -441,6 +446,8 @@ tp_group_get_remote_pending_cb (DBusGProxy *proxy,
                                     0,       /* actor */
                                     0,       /* reason */
                                     group);
+
+       g_array_free (handles, TRUE);
 }
 
 static void

diff --git a/src/empathy.c b/src/empathy.c
index e1a32a0b6d8e05ae41ed756c90d9f5b3b5126ac8..a1c521369c6c7e7c4ea95da4ff9a4d5ad30d817d 100644 (file)
--- a/src/empathy.c
+++ b/src/empathy.c
@@ -28,8 +28,6 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
-#include <libgnome/gnome-program.h>
-#include <libgnomeui/gnome-ui-init.h>
 #include <libebook/e-book.h>
 
 #include <libtelepathy/tp-conn.h>
@@ -265,7 +263,6 @@ main (int argc, char *argv[])
        McAccountMonitor  *monitor;
        EmpathyIdle       *idle;
        EmpathyChandler   *chandler;
-       GnomeProgram      *program;
        gboolean           no_connect = FALSE;
        GOptionContext    *context;
        GOptionEntry       options[] = {
@@ -287,15 +284,7 @@ main (int argc, char *argv[])
 
        g_set_application_name (PACKAGE_NAME);
 
-       program = gnome_program_init ("empathy",
-                                     PACKAGE_VERSION,
-                                     LIBGNOMEUI_MODULE,
-                                     argc, argv,
-                                     GNOME_PROGRAM_STANDARD_PROPERTIES,
-                                     "goption-context", context,
-                                     GNOME_PARAM_HUMAN_READABLE_NAME, PACKAGE_NAME,
-                                     NULL);
-
+       gtk_init (&argc, &argv);
        gtk_window_set_default_icon_name ("empathy");
        gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (),
                                           DATADIR G_DIR_SEPARATOR_S "empathy");
@@ -339,7 +328,6 @@ main (int argc, char *argv[])
        g_object_unref (mc);
        g_object_unref (idle);
        g_object_unref (icon);
-       g_object_unref (program);
 
        return EXIT_SUCCESS;
 }