diff options
Diffstat (limited to 'addressbook/gui/component')
| -rw-r--r-- | addressbook/gui/component/addressbook-component.c | 3 | ||||
| -rw-r--r-- | addressbook/gui/component/addressbook-view.c | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/addressbook/gui/component/addressbook-component.c b/addressbook/gui/component/addressbook-component.c index 1c9262365f..af65240d83 100644 --- a/addressbook/gui/component/addressbook-component.c +++ b/addressbook/gui/component/addressbook-component.c @@ -193,12 +193,11 @@ impl_createView (PortableServer_Servant servant, AddressbookComponent *addressbook_component = ADDRESSBOOK_COMPONENT (bonobo_object_from_servant (servant)); AddressbookComponentPrivate *priv = addressbook_component->priv; AddressbookView *view = addressbook_view_new (); + EComponentView *component_view; g_object_weak_ref (G_OBJECT (view), view_destroyed_cb, addressbook_component); priv->views = g_list_append (priv->views, view); - EComponentView *component_view; - component_view = e_component_view_new_controls (parent, "contacts", bonobo_control_new (addressbook_view_peek_sidebar (view)), addressbook_view_peek_folder_view (view), diff --git a/addressbook/gui/component/addressbook-view.c b/addressbook/gui/component/addressbook-view.c index 37cc297f6c..7defe5e42b 100644 --- a/addressbook/gui/component/addressbook-view.c +++ b/addressbook/gui/component/addressbook-view.c @@ -1169,6 +1169,8 @@ selector_tree_drag_data_received (GtkWidget *widget, EBook *source_book, *target_book; MergeContext *merge_context; GList *contactlist; + AddressbookView *view; + EABView *v; if (!gtk_tree_view_get_dest_row_at_pos (GTK_TREE_VIEW (widget), x, y, &path, &pos)) @@ -1193,8 +1195,8 @@ selector_tree_drag_data_received (GtkWidget *widget, eab_book_and_contact_list_from_string (data->data, &source_book, &contactlist); - AddressbookView *view = (AddressbookView *) user_data; - EABView *v = get_current_view (view); + view = (AddressbookView *) user_data; + v = get_current_view (view); g_object_get (v->model, "book",&source_book, NULL); /* Set up merge context */ |