From 7d53a155c8dcf9e232edcb3c70df6584713e1076 Mon Sep 17 00:00:00 2001 From: Chris Toshok Date: Wed, 13 Nov 2002 02:14:32 +0000 Subject: push_in = FALSE, no clue why... :) (_arrow_pressed): call 2002-11-12 Chris Toshok * gui/contact-editor/e-contact-editor.c (_popup_position): push_in = FALSE, no clue why... :) (_arrow_pressed): call g_signal_stop_emission here, seems to fix things. * gui/component/select-names/e-select-names.c (e_select_names_init): fix warnings. * gui/component/select-names/e-select-names-manager.c (e_select_names_manager_activate_dialog): fix warning. * gui/component/addressbook.c (forget_passwords_cb): remove the PENDING_PORT ifdef. (load_uri_auth_cb): same. (addressbook_authenticate): same. * gui/component/addressbook-factory.c (main): same. * gui/component/addressbook-storage.c (load_source_data): be silent about text nodes if they contain nothing but whitespace. svn path=/trunk/; revision=18728 --- addressbook/gui/component/addressbook-factory.c | 4 ---- addressbook/gui/component/addressbook-storage.c | 13 +++++++++++++ addressbook/gui/component/addressbook.c | 8 -------- .../gui/component/select-names/e-select-names-manager.c | 2 +- addressbook/gui/component/select-names/e-select-names.c | 6 +++--- 5 files changed, 17 insertions(+), 16 deletions(-) (limited to 'addressbook/gui/component') diff --git a/addressbook/gui/component/addressbook-factory.c b/addressbook/gui/component/addressbook-factory.c index 3e6f4e4598..506a7ebdc5 100644 --- a/addressbook/gui/component/addressbook-factory.c +++ b/addressbook/gui/component/addressbook-factory.c @@ -56,18 +56,14 @@ main (int argc, char **argv) glade_gnome_init (); e_cursors_init(); -#ifdef PENDING_PORT_WORK e_passwords_init("Addressbook"); -#endif #if 0 g_log_set_always_fatal (G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING); #endif /*g_thread_init (NULL);*/ -#ifdef PENDING_PORT_WORK camel_type_init (); -#endif gtk_widget_push_visual (gdk_rgb_get_visual ()); gtk_widget_push_colormap (gdk_rgb_get_cmap ()); diff --git a/addressbook/gui/component/addressbook-storage.c b/addressbook/gui/component/addressbook-storage.c index 7eb40281cf..6924052529 100644 --- a/addressbook/gui/component/addressbook-storage.c +++ b/addressbook/gui/component/addressbook-storage.c @@ -444,6 +444,19 @@ load_source_data (const char *file_path) source->binddn = get_string_value (child, "binddn"); source->limit = get_integer_value (child, "limit", 100); } + else if (!strcmp (child->name, "text")) { + if (child->content) { + int i; + for (i = 0; i < strlen (child->content); i++) { + if (!isspace (child->content[i])) { + g_warning ("illegal text in contactserver list."); + break; + } + } + } + g_free (source); + continue; + } else { g_warning ("unknown node '%s' in %s", child->name, file_path); g_free (source); diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c index e97c79d091..19c7b9c91a 100644 --- a/addressbook/gui/component/addressbook.c +++ b/addressbook/gui/component/addressbook.c @@ -208,9 +208,7 @@ move_contact_to_cb (BonoboUIComponent *uih, void *user_data, const char *path) static void forget_passwords_cb (BonoboUIComponent *uih, void *user_data, const char *path) { -#ifdef PENDING_PORT_WORK e_passwords_forget_passwords(); -#endif } static void @@ -593,9 +591,7 @@ load_uri_auth_cb (EBook *book, EBookStatus status, gpointer closure) return; } else { -#ifdef PENDING_PORT_WORK e_passwords_forget_password (data->clean_uri); -#endif addressbook_authenticate (book, TRUE, data->source, load_uri_auth_cb, closure); return; } @@ -623,9 +619,7 @@ addressbook_authenticate (EBook *book, gboolean previous_failure, AddressbookSou if (semicolon) *semicolon = '\0'; -#ifdef PENDING_PORT_WORK password = e_passwords_get_password (load_uri_data->clean_uri); -#endif if (!password) { char *prompt; @@ -647,11 +641,9 @@ addressbook_authenticate (EBook *book, gboolean previous_failure, AddressbookSou prompt = g_strdup_printf (_("%sEnter password for %s (user %s)"), failed_auth, source->name, source->email_addr); remember = source->remember_passwd; -#ifdef PENDING_PORT_WORK pass_dup = e_passwords_ask_password (prompt, load_uri_data->clean_uri, prompt, TRUE, E_PASSWORDS_REMEMBER_FOREVER, &remember, NULL); -#endif if (remember != source->remember_passwd) { source->remember_passwd = remember; addressbook_storage_write_sources (); diff --git a/addressbook/gui/component/select-names/e-select-names-manager.c b/addressbook/gui/component/select-names/e-select-names-manager.c index 9d26dc4dc5..80a1cffbda 100644 --- a/addressbook/gui/component/select-names/e-select-names-manager.c +++ b/addressbook/gui/component/select-names/e-select-names-manager.c @@ -612,7 +612,7 @@ e_select_names_manager_activate_dialog (ESelectNamesManager *manager, G_CALLBACK(e_select_names_clicked), manager); - g_object_weak_ref (manager->names, clear_widget, &manager->names); + g_object_weak_ref (G_OBJECT (manager->names), clear_widget, &manager->names); gtk_widget_show(GTK_WIDGET(manager->names)); } diff --git a/addressbook/gui/component/select-names/e-select-names.c b/addressbook/gui/component/select-names/e-select-names.c index 7120537070..41c5a628c1 100644 --- a/addressbook/gui/component/select-names/e-select-names.c +++ b/addressbook/gui/component/select-names/e-select-names.c @@ -511,7 +511,7 @@ e_select_names_init (ESelectNames *e_select_names) if (e_select_names->status_message) { g_signal_connect (e_select_names->model, "status_message", G_CALLBACK (status_message), e_select_names); - g_object_weak_ref (e_select_names->status_message, clear_widget, &e_select_names->status_message); + g_object_weak_ref (G_OBJECT (e_select_names->status_message), clear_widget, &e_select_names->status_message); } e_select_names->categories = glade_xml_get_widget (gui, "custom-categories"); @@ -520,7 +520,7 @@ e_select_names_init (ESelectNames *e_select_names) if (e_select_names->categories) { g_signal_connect(e_select_names->categories, "changed", G_CALLBACK(categories_changed), e_select_names); - g_object_weak_ref (e_select_names->categories, clear_widget, &e_select_names->categories); + g_object_weak_ref (G_OBJECT (e_select_names->categories), clear_widget, &e_select_names->categories); } e_select_names->select_entry = glade_xml_get_widget (gui, "entry-select"); @@ -531,7 +531,7 @@ e_select_names_init (ESelectNames *e_select_names) G_CALLBACK(select_entry_changed), e_select_names); g_signal_connect(e_select_names->select_entry, "activate", G_CALLBACK(update_query), e_select_names); - g_object_weak_ref (e_select_names->select_entry, clear_widget, &e_select_names->select_entry); + g_object_weak_ref (G_OBJECT (e_select_names->select_entry), clear_widget, &e_select_names->select_entry); } button = glade_xml_get_widget (gui, "button-find"); -- cgit v1.2.3