diff options
Diffstat (limited to 'addressbook/gui/component')
-rw-r--r-- | addressbook/gui/component/addressbook-component.c | 4 | ||||
-rw-r--r-- | addressbook/gui/component/addressbook-config.c | 4 | ||||
-rw-r--r-- | addressbook/gui/component/addressbook-migrate.c | 24 | ||||
-rw-r--r-- | addressbook/gui/component/addressbook-view.c | 11 |
4 files changed, 2 insertions, 41 deletions
diff --git a/addressbook/gui/component/addressbook-component.c b/addressbook/gui/component/addressbook-component.c index b1928669c2..9c3fae50c5 100644 --- a/addressbook/gui/component/addressbook-component.c +++ b/addressbook/gui/component/addressbook-component.c @@ -282,12 +282,8 @@ impl_requestCreateItem (PortableServer_Servant servant, const CORBA_char *item_type_name, CORBA_Environment *ev) { - AddressbookComponent *addressbook_component = ADDRESSBOOK_COMPONENT (bonobo_object_from_servant (servant)); - AddressbookComponentPrivate *priv; EBook *book; - priv = addressbook_component->priv; - if (!item_type_name || (strcmp (item_type_name, "address_book") && strcmp (item_type_name, "contact") && diff --git a/addressbook/gui/component/addressbook-config.c b/addressbook/gui/component/addressbook-config.c index b8822848f7..c7605e1163 100644 --- a/addressbook/gui/component/addressbook-config.c +++ b/addressbook/gui/component/addressbook-config.c @@ -521,7 +521,7 @@ eabc_general_type(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, str GtkTreeIter iter; GSList *l; GtkWidget *w, *label; - int i, row; + int i, row = 0; if (old) return old; @@ -622,7 +622,6 @@ eabc_general_offline(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, AddressbookSourceDialog *sdialog = data; GtkWidget *offline_setting; const char *offline_sync; - int row; gboolean is_local_book; is_local_book = g_str_has_prefix (e_source_group_peek_base_uri (sdialog->source_group), "file:"); @@ -630,7 +629,6 @@ eabc_general_offline(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, if (old) return old; else { - row = ((GtkTable*)parent)->nrows; offline_setting = gtk_check_button_new_with_label (N_("Copy book content locally for offline operation")); gtk_widget_show (offline_setting); gtk_container_add (GTK_CONTAINER (parent), offline_setting); diff --git a/addressbook/gui/component/addressbook-migrate.c b/addressbook/gui/component/addressbook-migrate.c index 5f56b24dfe..c4516c4b0a 100644 --- a/addressbook/gui/component/addressbook-migrate.c +++ b/addressbook/gui/component/addressbook-migrate.c @@ -220,30 +220,6 @@ get_source_name (ESourceGroup *group, const char *path) } static void -add_to_notes (EContact *contact, EContactField field) -{ - const gchar *old_text; - const gchar *field_text; - gchar *new_text; - - old_text = e_contact_get_const (contact, E_CONTACT_NOTE); - if (old_text && strstr (old_text, e_contact_pretty_name (field))) - return; - - field_text = e_contact_get_const (contact, field); - if (!field_text || !*field_text) - return; - - new_text = g_strdup_printf ("%s%s%s: %s", - old_text ? old_text : "", - old_text && *old_text && - *(old_text + strlen (old_text) - 1) != '\n' ? "\n" : "", - e_contact_pretty_name (field), field_text); - e_contact_set (contact, E_CONTACT_NOTE, new_text); - g_free (new_text); -} - -static void migrate_contacts (MigrationContext *context, EBook *old_book, EBook *new_book) { EBookQuery *query = e_book_query_any_field_contains (""); diff --git a/addressbook/gui/component/addressbook-view.c b/addressbook/gui/component/addressbook-view.c index 72f1a79e78..68112e49e1 100644 --- a/addressbook/gui/component/addressbook-view.c +++ b/addressbook/gui/component/addressbook-view.c @@ -180,15 +180,6 @@ view_contact_cb (BonoboUIComponent *uih, void *user_data, const char *path) } static void -search_cb (BonoboUIComponent *uih, void *user_data, const char *path) -{ - AddressbookView *view = (AddressbookView *) user_data; - EABView *v = get_current_view (view); - if (v) - gtk_widget_show(eab_search_dialog_new(v)); -} - -static void delete_contact_cb (BonoboUIComponent *uih, void *user_data, const char *path) { AddressbookView *view = (AddressbookView *) user_data; @@ -1055,7 +1046,7 @@ selector_tree_drag_motion (GtkWidget *widget, GtkTreeViewDropPosition pos; GtkTreeModel *model; GtkTreeIter iter; - GdkDragAction action; + GdkDragAction action = { 0, }; if (!gtk_tree_view_get_dest_row_at_pos (GTK_TREE_VIEW (widget), x, y, &path, &pos)) |