diff options
| -rw-r--r-- | filter/ChangeLog | 5 | ||||
| -rw-r--r-- | filter/vfolder-rule.c | 27 |
2 files changed, 15 insertions, 17 deletions
diff --git a/filter/ChangeLog b/filter/ChangeLog index 6e7f9c8629..0c7181b12d 100644 --- a/filter/ChangeLog +++ b/filter/ChangeLog @@ -1,3 +1,8 @@ +2003-02-12 Jeffrey Stedfast <fejj@ximian.com> + + * vfolder-rule.c (source_add): Get rid of the need for the + GTK_WIDGET_DESTROYED() check. + 2003-02-07 Jeffrey Stedfast <fejj@ximian.com> * filter-editor.c (filter_editor_new): Use g_object_new() diff --git a/filter/vfolder-rule.c b/filter/vfolder-rule.c index 1126cb9871..fc7e1b853a 100644 --- a/filter/vfolder-rule.c +++ b/filter/vfolder-rule.c @@ -397,24 +397,17 @@ source_add (GtkWidget *widget, struct _source_data *data) static const char *allowed_types[] = { "mail/*", NULL }; GNOME_Evolution_Folder *folder; GtkTreeSelection *selection; + GtkWidget *window; GtkTreeIter iter; - char *def, *uri; - - gtk_widget_set_sensitive (widget, FALSE); - def = ""; - evolution_shell_client_user_select_folder (global_shell_client, - GTK_WINDOW (gtk_widget_get_toplevel (widget)), - _("Select Folder"), - def, allowed_types, &folder); -#warning "gtk_object_destroyed?" -#if 0 - if (GTK_OBJECT_DESTROYED (widget)) { - if (folder) - CORBA_free (folder); - return; - } -#endif - gtk_widget_set_sensitive (widget, TRUE); + char *uri; + + window = gtk_widget_get_toplevel (widget); + gtk_widget_set_sensitive (window, FALSE); + + evolution_shell_client_user_select_folder (global_shell_client, GTK_WINDOW (window), + _("Select Folder"), "", allowed_types, &folder); + + gtk_widget_set_sensitive (window, TRUE); if (folder) { uri = g_strdup (folder->physicalUri); |