evolution-data-server r9953 - branches/dbus/addressbook/libedata-book

[rburton svn gnome org]

Author: rburton
Date: Mon Jan 19 11:25:15 2009
New Revision: 9953
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=9953&view=rev

Log:
Minor changes from eds-dbus

Modified:
   branches/dbus/addressbook/libedata-book/e-data-book-factory.c

Modified: branches/dbus/addressbook/libedata-book/e-data-book-factory.c
==============================================================================
--- branches/dbus/addressbook/libedata-book/e-data-book-factory.c	(original)
+++ branches/dbus/addressbook/libedata-book/e-data-book-factory.c	Mon Jan 19 11:25:15 2009
@@ -41,8 +41,6 @@
 
 static GMainLoop *loop;
 static EDataBookFactory *factory;
-static DBusGProxy *bus_proxy, *backup_proxy;
-
 DBusGConnection *connection;
 
 /* Convenience macro to test and set a GError/return on failure */
@@ -128,7 +126,6 @@
 e_data_book_factory_init (EDataBookFactory *factory)
 {
   factory->priv = E_DATA_BOOK_FACTORY_GET_PRIVATE (factory);
-  g_assert (factory->priv);
 
   factory->priv->backend_lock = g_mutex_new ();
   factory->priv->backends = g_hash_table_new (g_str_hash, g_str_equal);
@@ -138,7 +135,7 @@
 
   factory->priv->connections_lock = g_mutex_new ();
   factory->priv->connections = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
-  
+
   e_data_server_module_init ();
   e_data_book_factory_register_backends (factory);
 }
@@ -177,7 +174,8 @@
   return backend_factory;
 }
 
-static char* make_path_name(const char* uri)
+static char *
+make_path_name (const char* uri)
 {
   char *s, *path;
   s = nm_dbus_escape_object_path (uri);
@@ -284,35 +282,20 @@
 
 /* Convenience function to print an error and exit */
 static void
-die (const char *prefix, GError *error) 
+die (const char *prefix, GError *error)
 {
   g_error("%s: %s", prefix, error->message);
   g_error_free (error);
   exit(1);
 }
 
-static void
-sync_book_foreach (gpointer key, gpointer value, gpointer user_data)
-{
-  EDataBook *book = E_DATA_BOOK (value);
-  g_assert (book);
-  e_book_backend_sync (book->backend);
-}
-
-static void
-backup_start (DBusGProxy *proxy, EDataBookFactory *factory)
-{
-  g_mutex_lock (factory->priv->books_lock);
-  g_hash_table_foreach (factory->priv->books, sync_book_foreach, NULL);
-  g_mutex_unlock (factory->priv->books_lock);
-}
-
 #define E_DATA_BOOK_FACTORY_SERVICE_NAME "org.gnome.evolution.dataserver.AddressBook"
 
 int
 main (int argc, char **argv)
 {
   GError *error = NULL;
+  DBusGProxy *bus_proxy;
   guint32 request_name_ret;
 
   g_type_init ();
@@ -349,14 +332,6 @@
                            G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INVALID);
   dbus_g_proxy_connect_signal (bus_proxy, "NameOwnerChanged", G_CALLBACK (name_owner_changed), factory, NULL);
 
-  /* Nokia 770 specific code: listen for backup starting signals */
-  backup_proxy = dbus_g_proxy_new_for_name (connection,
-                                            "com.nokia.backup",
-                                            "/com/nokia/backup",
-                                            "com.nokia.backup");
-  dbus_g_proxy_add_signal (backup_proxy, "backup_start", G_TYPE_INVALID);
-  dbus_g_proxy_connect_signal (backup_proxy, "backup_start", G_CALLBACK (backup_start), factory, NULL);
-
   g_main_loop_run (loop);
 
   dbus_g_connection_unref (connection);