From 7277cf7ff4d63475c1f25ba6546950dc49284c46 Mon Sep 17 00:00:00 2001 From: Chris Toshok Date: Thu, 3 Apr 2003 06:13:33 +0000 Subject: change all this around so that we populate the existing popup. This means 2003-04-02 Chris Toshok * gui/component/select-names/e-select-names-popup.c: change all this around so that we populate the existing popup. This means we get the select names popup stuff on top of the normal EEntry popup foo. * gui/component/select-names/e-select-names-popup.h (e_select_names_populate_popup): rename e_select_names_popup to this. * gui/component/select-names/e-select-names-manager.c (populate_popup_cb): rename popup_cb here, and e_select_names_popup -> e_select_names_populate_popup. (e_select_names_manager_entry_new): popup -> populate_popup. svn path=/trunk/; revision=20654 --- addressbook/gui/component/select-names/e-select-names-manager.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'addressbook/gui/component/select-names/e-select-names-manager.c') 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 b53cf924f2..a3875cea97 100644 --- a/addressbook/gui/component/select-names/e-select-names-manager.c +++ b/addressbook/gui/component/select-names/e-select-names-manager.c @@ -141,7 +141,7 @@ get_entry_info (EEntry *entry) } static void -popup_cb (EEntry *eentry, GdkEventButton *ev, gint pos, gpointer user_data) +populate_popup_cb (EEntry *eentry, GdkEventButton *ev, gint pos, GtkWidget *menu, gpointer user_data) { ESelectNamesTextModel *text_model; @@ -150,7 +150,7 @@ popup_cb (EEntry *eentry, GdkEventButton *ev, gint pos, gpointer user_data) NULL); g_assert (E_IS_SELECT_NAMES_TEXT_MODEL (text_model)); - e_select_names_popup (text_model, ev, pos, GTK_WIDGET (eentry)); + e_select_names_populate_popup (menu, text_model, ev, pos, GTK_WIDGET (eentry)); } #if 0 @@ -283,8 +283,8 @@ e_select_names_manager_entry_new (ESelectNamesManager *manager, ESelectNamesMode g_object_ref (model); g_signal_connect (entry->entry, - "popup", - G_CALLBACK (popup_cb), + "populate_popup", + G_CALLBACK (populate_popup_cb), entry); g_signal_connect (entry->entry->canvas, -- cgit v1.2.3