aboutsummaryrefslogtreecommitdiffstats
path: root/shell/e-local-storage.c
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2002-11-04 06:08:16 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2002-11-04 06:08:16 +0800
commitede7fcb220b739c4d12775904086afe0df595acd (patch)
treecae8198cf8f57d3e08d13c03538e69a411f8a45c /shell/e-local-storage.c
parent9cbba714fc0eb122c0736b94727b4d2580b9d53c (diff)
downloadgsoc2013-evolution-ede7fcb220b739c4d12775904086afe0df595acd.tar
gsoc2013-evolution-ede7fcb220b739c4d12775904086afe0df595acd.tar.gz
gsoc2013-evolution-ede7fcb220b739c4d12775904086afe0df595acd.tar.bz2
gsoc2013-evolution-ede7fcb220b739c4d12775904086afe0df595acd.tar.lz
gsoc2013-evolution-ede7fcb220b739c4d12775904086afe0df595acd.tar.xz
gsoc2013-evolution-ede7fcb220b739c4d12775904086afe0df595acd.tar.zst
gsoc2013-evolution-ede7fcb220b739c4d12775904086afe0df595acd.zip
Changed all gtk_object_refs()/gtk_object_unrefs() into
* *.c, *.h: Changed all gtk_object_refs()/gtk_object_unrefs() into g_object_refs()/g_object_unrefs() and all gtk_signal_connect_*() into g_signal_connect_*(). [Except for some case where we have gtk_signal_connect_full() or gtk_signal_connect_while_alive() calls that cannot be trivially ported to use the g_signal_* functions, we'll have to fix those later.] * e-splash.c (impl_finalize): Finalize implementation, copied over from impl_destroy. (impl_destroy): Removed. (class_init): Override finalize, not destroy. * e-activity-handler.c: Ported from GtkObject to GObject. * evolution-storage.c: Likewise. * e-corba-shortcuts.c: Likewise. * evolution-session.h: Likewise. * evolution-config-control.c: Likewise. * evolution-shell-component-dnd.c: Likewise. * evolution-shell-component.c: Likewise. * evolution-shell-view.c: Likewise. * evolution-storage-set-view.c: Likewise. * evolution-wizard.c: Likewise. svn path=/trunk/; revision=18513
Diffstat (limited to 'shell/e-local-storage.c')
-rw-r--r--shell/e-local-storage.c32
1 files changed, 17 insertions, 15 deletions
diff --git a/shell/e-local-storage.c b/shell/e-local-storage.c
index ebd534e4a6..721ec40a27 100644
--- a/shell/e-local-storage.c
+++ b/shell/e-local-storage.c
@@ -197,15 +197,17 @@ load_folder (const char *physical_path,
folder = e_local_folder_new_from_path (physical_path);
if (folder == NULL) {
- g_warning ("No folder metadata in %s... ignoring", physical_path);
+ /* g_warning ("No folder metadata in %s... ignoring", physical_path); FIXME */
return TRUE;
}
/* Ignore the folder if it uses an unknown type. */
if (! e_folder_type_registry_type_registered (local_storage->priv->folder_type_registry,
e_folder_get_type_string (folder))) {
+#if 0
g_warning ("Folder in %s has unknown type (%s)... ignoring",
physical_path, e_folder_get_type_string (folder));
+#endif
return TRUE;
}
@@ -314,7 +316,7 @@ component_async_create_folder_callback (EvolutionShellComponentClient *shell_com
callback_data->path, folder);
} else {
rmdir (callback_data->physical_path);
- gtk_object_unref (GTK_OBJECT (folder));
+ g_object_unref (folder);
storage_result = E_STORAGE_IOERROR;
}
}
@@ -323,7 +325,7 @@ component_async_create_folder_callback (EvolutionShellComponentClient *shell_com
if (callback_data->listener != CORBA_OBJECT_NIL)
notify_listener (callback_data->listener, storage_result,
- callback_data->physical_path);
+ callback_data->physical_path);
if (callback_data->callback != NULL)
(* callback_data->callback) (callback_data->storage,
@@ -692,7 +694,7 @@ impl_destroy (GtkObject *object)
g_free (priv->base_path);
if (priv->folder_type_registry != NULL)
- gtk_object_unref (GTK_OBJECT (priv->folder_type_registry));
+ g_object_unref (priv->folder_type_registry);
if (priv->bonobo_interface != NULL)
bonobo_object_unref (BONOBO_OBJECT (priv->bonobo_interface));
@@ -1115,7 +1117,7 @@ construct (ELocalStorage *local_storage,
g_return_val_if_fail (base_path_len != 0, FALSE);
g_assert (priv->folder_type_registry == NULL);
- gtk_object_ref (GTK_OBJECT (folder_type_registry));
+ g_object_ref (folder_type_registry);
priv->folder_type_registry = folder_type_registry;
g_assert (priv->base_path == NULL);
@@ -1124,15 +1126,15 @@ construct (ELocalStorage *local_storage,
g_assert (priv->bonobo_interface == NULL);
priv->bonobo_interface = evolution_storage_new (E_LOCAL_STORAGE_NAME, FALSE);
- gtk_signal_connect (GTK_OBJECT (priv->bonobo_interface), "create_folder",
- GTK_SIGNAL_FUNC (bonobo_interface_create_folder_cb),
- local_storage);
- gtk_signal_connect (GTK_OBJECT (priv->bonobo_interface), "remove_folder",
- GTK_SIGNAL_FUNC (bonobo_interface_remove_folder_cb),
- local_storage);
- gtk_signal_connect (GTK_OBJECT (priv->bonobo_interface), "update_folder",
- GTK_SIGNAL_FUNC (bonobo_interface_update_folder_cb),
- local_storage);
+ g_signal_connect (priv->bonobo_interface, "create_folder",
+ G_CALLBACK (bonobo_interface_create_folder_cb),
+ local_storage);
+ g_signal_connect (priv->bonobo_interface, "remove_folder",
+ G_CALLBACK (bonobo_interface_remove_folder_cb),
+ local_storage);
+ g_signal_connect (priv->bonobo_interface, "update_folder",
+ G_CALLBACK (bonobo_interface_update_folder_cb),
+ local_storage);
return load_all_folders (local_storage);
}
@@ -1150,7 +1152,7 @@ e_local_storage_open (EFolderTypeRegistry *folder_type_registry,
new = gtk_type_new (e_local_storage_get_type ());
if (! construct (E_LOCAL_STORAGE (new), folder_type_registry, base_path)) {
- gtk_object_unref (GTK_OBJECT (new));
+ g_object_unref (new);
return NULL;
}