diff options
| -rw-r--r-- | mail/ChangeLog | 5 | ||||
| -rw-r--r-- | mail/em-account-prefs.c | 22 | ||||
| -rw-r--r-- | mail/em-folder-view.c | 2 | ||||
| -rw-r--r-- | mail/em-menu.h | 3 |
4 files changed, 14 insertions, 18 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index f1a1d3c3f5..044d0d812c 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,8 @@ +2005-01-07 Not Zed <NotZed@Ximian.com> + + * em-account-prefs.c (account_add_clicked): remove old code, setup + transient parent and weak ref for refresh. + 2005-01-06 JP Rosevear <jpr@novell.com> * Makefile.am: install schemas properly diff --git a/mail/em-account-prefs.c b/mail/em-account-prefs.c index 36e50be9f1..d6276c434a 100644 --- a/mail/em-account-prefs.c +++ b/mail/em-account-prefs.c @@ -143,26 +143,16 @@ account_add_clicked (GtkButton *button, gpointer user_data) EMAccountPrefs *prefs = (EMAccountPrefs *) user_data; if (prefs->druid == NULL) { -#if 0 - GtkWidget *parent; - - prefs->druid = (GtkWidget *) mail_config_druid_new (); - - parent = gtk_widget_get_toplevel ((GtkWidget *) prefs); - if (GTK_WIDGET_TOPLEVEL (parent)) - gtk_window_set_transient_for ((GtkWindow *) prefs->druid, (GtkWindow *) parent); - - g_object_weak_ref ((GObject *) prefs->druid, - (GWeakNotify) account_add_finished, prefs); - - gtk_widget_show (prefs->druid); - g_object_ref (prefs); -#else EMAccountEditor *emae; emae = em_account_editor_new(NULL, EMAE_DRUID); + prefs->druid = emae->editor; + + gtk_window_set_transient_for((GtkWindow *)prefs->druid, (GtkWindow *)gtk_widget_get_toplevel((GtkWidget *)prefs)); + g_object_ref(prefs); + /* rather nasty hack to reload the accounts, it should just listen to the e-account-list */ + g_object_weak_ref((GObject *) prefs->druid, (GWeakNotify) account_add_finished, prefs); gtk_widget_show(emae->editor); -#endif } else { gdk_window_raise (prefs->druid->window); } diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c index c019b848b8..2d82f11fcc 100644 --- a/mail/em-folder-view.c +++ b/mail/em-folder-view.c @@ -251,7 +251,7 @@ emfv_destroy (GtkObject *o) } if (p->invisible) { - gtk_object_destroy(p->invisible); + gtk_object_destroy((GtkObject *)p->invisible); p->invisible = NULL; } diff --git a/mail/em-menu.h b/mail/em-menu.h index 043689520c..d0e372af3e 100644 --- a/mail/em-menu.h +++ b/mail/em-menu.h @@ -64,7 +64,8 @@ enum { EM_MENU_SELECT_LAST = 1<<18 /* reserve 2 slots */ }; -/* Flags that describe a TARGET_WIDGET (none) */ +/* Flags that describe a TARGET_WIDGET (none) + this should probably be a more specific target type */ typedef struct _EMMenuTargetSelect EMMenuTargetSelect; |