aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--e-util/ChangeLog6
-rw-r--r--e-util/e-categories-config.c8
2 files changed, 9 insertions, 5 deletions
diff --git a/e-util/ChangeLog b/e-util/ChangeLog
index 3337c7b1d0..5a800998ce 100644
--- a/e-util/ChangeLog
+++ b/e-util/ChangeLog
@@ -1,3 +1,9 @@
+2003-01-24 Hans Petter Jansson <hpj@ximian.com>
+
+ * e-categories-config.c (initialize_categories_config): Enable
+ getting the categories master list from wombat.
+ (e_categories_config_open_dialog_for_entry): It's now a GtkDialog.
+
2003-01-22 Ettore Perazzoli <ettore@ximian.com>
* Makefile.am (eutilincludedir): Version using $(BASE_VERSION).
diff --git a/e-util/e-categories-config.c b/e-util/e-categories-config.c
index 6d286197b6..7131f7b88c 100644
--- a/e-util/e-categories-config.c
+++ b/e-util/e-categories-config.c
@@ -25,9 +25,7 @@ initialize_categories_config (void)
{
g_return_if_fail (initialized == FALSE);
-#if 0
ecmlw = E_CATEGORIES_MASTER_LIST_WOMBAT (e_categories_master_list_wombat_new ());
-#endif
icons_table = g_hash_table_new (g_str_hash, g_str_equal);
/* FIXME: must free the two objects above when exiting */
@@ -175,7 +173,7 @@ e_categories_config_set_icon_for (const char *category, const char *icon_file)
void
e_categories_config_open_dialog_for_entry (GtkEntry *entry)
{
- GnomeDialog *dialog;
+ GtkDialog *dialog;
const char *text;
char *categories;
int result;
@@ -187,14 +185,14 @@ e_categories_config_open_dialog_for_entry (GtkEntry *entry)
initialize_categories_config ();
text = gtk_entry_get_text (GTK_ENTRY (entry));
- dialog = GNOME_DIALOG (e_categories_new (text));
+ dialog = GTK_DIALOG (e_categories_new (text));
gtk_object_set (GTK_OBJECT (dialog),
"ecml", ecmlw,
NULL);
/* run the dialog */
- result = gnome_dialog_run (dialog);
+ result = gtk_dialog_run (dialog);
if (result == 0) {
gtk_object_get (GTK_OBJECT (dialog),