aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--addressbook/ChangeLog9
-rw-r--r--addressbook/gui/component/select-names/e-select-names.c16
2 files changed, 25 insertions, 0 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index ae664995d0..97ad58f899 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,5 +1,14 @@
2002-08-28 Chris Toshok <toshok@ximian.com>
+ [ oops, merged the .h and .glade file back to the HEAD from the
+ 1-0 branch, but missed the .c file. ]
+ * gui/component/select-names/e-select-names.c (status_message): set
+ the status label's text.
+ (e_select_names_init): get the status message widget from the
+ glade ui.
+
+2002-08-28 Chris Toshok <toshok@ximian.com>
+
[ fixes #19286 ]
* gui/component/addressbook.c (delete_contact_cb): confirm
deletion of contacts when using the menubar or toolbar.
diff --git a/addressbook/gui/component/select-names/e-select-names.c b/addressbook/gui/component/select-names/e-select-names.c
index 791293ae35..193ec51ff5 100644
--- a/addressbook/gui/component/select-names/e-select-names.c
+++ b/addressbook/gui/component/select-names/e-select-names.c
@@ -415,6 +415,15 @@ update_query (GtkWidget *widget, ESelectNames *e_select_names)
}
static void
+status_message (EAddressbookModel *model, const gchar *message, ESelectNames *e_select_names)
+{
+ if (message == NULL)
+ gtk_label_set_text (GTK_LABEL (e_select_names->status_message), "");
+ else
+ gtk_label_set_text (GTK_LABEL (e_select_names->status_message), message);
+}
+
+static void
categories_changed (GtkWidget *widget, gint value, ESelectNames *e_select_names)
{
update_query (widget, e_select_names);
@@ -516,6 +525,13 @@ e_select_names_init (ESelectNames *e_select_names)
e_select_names->adapter = gtk_object_get_data(GTK_OBJECT(e_select_names->table), "adapter");
e_select_names->without = gtk_object_get_data(GTK_OBJECT(e_select_names->table), "without");
+ e_select_names->status_message = glade_xml_get_widget (gui, "status-message");
+ if (e_select_names->status_message && !GTK_IS_LABEL (e_select_names->status_message))
+ e_select_names->status_message = NULL;
+ if (e_select_names->status_message)
+ gtk_signal_connect (GTK_OBJECT (e_select_names->model), "status_message",
+ GTK_SIGNAL_FUNC (status_message), e_select_names);
+
e_select_names->categories = glade_xml_get_widget (gui, "custom-categories");
if (e_select_names->categories && !E_IS_CATEGORIES_MASTER_LIST_OPTION_MENU (e_select_names->categories))
e_select_names->categories = NULL;