aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook/gui/component/addressbook-storage.c
diff options
context:
space:
mode:
authorChris Toshok <toshok@ximian.com>2002-11-06 18:48:35 +0800
committerChris Toshok <toshok@src.gnome.org>2002-11-06 18:48:35 +0800
commit01044271e5c892367d6b51680ca63cec154d42f9 (patch)
treef1d0656578d88c2fd9c5a0f0fa1f2876a56ca784 /addressbook/gui/component/addressbook-storage.c
parentc3223fe1a09692bd2f2a4b4d37dafafd97a7bf32 (diff)
downloadgsoc2013-evolution-01044271e5c892367d6b51680ca63cec154d42f9.tar
gsoc2013-evolution-01044271e5c892367d6b51680ca63cec154d42f9.tar.gz
gsoc2013-evolution-01044271e5c892367d6b51680ca63cec154d42f9.tar.bz2
gsoc2013-evolution-01044271e5c892367d6b51680ca63cec154d42f9.tar.lz
gsoc2013-evolution-01044271e5c892367d6b51680ca63cec154d42f9.tar.xz
gsoc2013-evolution-01044271e5c892367d6b51680ca63cec154d42f9.tar.zst
gsoc2013-evolution-01044271e5c892367d6b51680ca63cec154d42f9.zip
fix the gnome-xml headers.
2002-11-06 Chris Toshok <toshok@ximian.com> * gui/widgets/gal-view-minicard.c: fix the gnome-xml headers. * gui/widgets/e-addressbook-view.c (e_addressbook_view_class_init): convert from gtk signals and args to GSignal and GObject properties. (e_addressbook_view_dispose): rename _destroy to this. (e_addressbook_view_set_property): rework _set_arg to this. (e_addressbook_view_get_property): rework _get_arg to this. (display_view): if we're here we need to choose a view, regardless of whether or not the GAL_IS_VIEW_* macros tell us which type it is. * gui/widgets/e-addressbook-table-adapter.c: fix the gnome-xml headers. * gui/widgets/e-addressbook-model.c (e_addressbook_model_class_init): use INT, not ENUM in the signal here. * gui/component/addressbook-config.c: another big gtk_* -> g_* renaming. * gui/component/addressbook.c: same. * gui/component/e-address-popup.c: same. * gui/component/e-address-widget.c: same. * gui/component/e-cardlist-model.c: fix the gnome-xml headers, and more gtk_* -> g_* renaming. * gui/component/addressbook-component.c (owner_set_cb): use evolution_shell_client_corba_objref as per ettore's change to EvolutionShellClient.. (create_view): fix the call to bonobo_control_set_property. (create_component): gtk_signal_connect -> g_signal_connect. * gui/component/addressbook-storage.c: fix the gnome-xml headers. (addressbook_storage_setup): use evolution_shell_client_corba_objref as per ettore's change to EvolutionShellClient.. (addressbook_get_other_contact_storage): gtk_signal_connect -> g_signal_connect. (load_source_data): root->childs -> root->childrens. svn path=/trunk/; revision=18598
Diffstat (limited to 'addressbook/gui/component/addressbook-storage.c')
-rw-r--r--addressbook/gui/component/addressbook-storage.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/addressbook/gui/component/addressbook-storage.c b/addressbook/gui/component/addressbook-storage.c
index 657762edca..7eb40281cf 100644
--- a/addressbook/gui/component/addressbook-storage.c
+++ b/addressbook/gui/component/addressbook-storage.c
@@ -50,8 +50,8 @@
#include <glib.h>
#include <gtk/gtk.h>
-#include <gnome-xml/parser.h>
-#include <gnome-xml/xmlmemory.h>
+#include <libxml/parser.h>
+#include <libxml/xmlmemory.h>
#include <libgnome/gnome-i18n.h>
#include <libgnome/gnome-util.h>
@@ -91,7 +91,7 @@ addressbook_storage_setup (EvolutionShellComponent *shell_component,
return;
}
- corba_shell = bonobo_object_corba_objref (BONOBO_OBJECT (shell_client));
+ corba_shell = evolution_shell_client_corba_objref (shell_client);
sources = NULL;
@@ -164,12 +164,12 @@ addressbook_get_other_contact_storage (void)
if (storage == NULL) {
storage = evolution_storage_new (_("Other Contacts"), FALSE);
- gtk_signal_connect (GTK_OBJECT (storage),
- "remove_folder",
- GTK_SIGNAL_FUNC(remove_ldap_folder), NULL);
- gtk_signal_connect (GTK_OBJECT (storage),
- "create_folder",
- GTK_SIGNAL_FUNC(create_ldap_folder), NULL);
+ g_signal_connect (storage,
+ "remove_folder",
+ G_CALLBACK (remove_ldap_folder), NULL);
+ g_signal_connect (storage,
+ "create_folder",
+ G_CALLBACK (create_ldap_folder), NULL);
result = evolution_storage_register_on_shell (storage, corba_shell);
switch (result) {
case EVOLUTION_STORAGE_OK:
@@ -427,7 +427,7 @@ load_source_data (const char *file_path)
return FALSE;
}
- for (child = root->childs; child; child = child->next) {
+ for (child = root->children; child; child = child->next) {
char *path;
AddressbookSource *source;