diff options
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/ChangeLog | 6 | ||||
| -rw-r--r-- | mail/em-folder-browser.c | 4 | ||||
| -rw-r--r-- | mail/em-migrate.c | 14 |
3 files changed, 15 insertions, 9 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 8e71d1564c..3be6315b11 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,9 @@ +2009-02-11 Andre Klapper <a9016009@gmx.de> + + * em-folder-browser.c: + * em-migrate.c: + Substitute some deprecated gtk+ functions. + 2009-02-11 Milan Crha <mcrha@redhat.com> ** Fix for bug #569700 diff --git a/mail/em-folder-browser.c b/mail/em-folder-browser.c index b0b507b1a3..39eae48266 100644 --- a/mail/em-folder-browser.c +++ b/mail/em-folder-browser.c @@ -551,7 +551,7 @@ emfb_init(GObject *o) gtk_widget_show(emfb->vpane); - gtk_box_pack_start_defaults((GtkBox *)emfb, emfb->vpane); + gtk_box_pack_start((GtkBox *)emfb, emfb->vpane, TRUE, TRUE, 0); gtk_paned_pack1 (GTK_PANED (emfb->vpane), GTK_WIDGET (emfb->view.list), FALSE, FALSE); gtk_widget_show((GtkWidget *)emfb->view.list); @@ -784,7 +784,7 @@ void em_folder_browser_show_wide(EMFolderBrowser *emfb, gboolean state) g_signal_connect(w, "realize", G_CALLBACK(emfb_pane_realised), emfb); emfb->priv->vpane_resize_id = g_signal_connect(w, "button_release_event", G_CALLBACK(emfb_pane_button_release_event), emfb); - gtk_box_pack_start_defaults((GtkBox *)emfb, w); + gtk_box_pack_start((GtkBox *)emfb, w, TRUE, TRUE, 0); gtk_widget_reparent((GtkWidget *)emfb->view.list, w); gtk_widget_reparent((GtkWidget *)emfb->priv->preview, w); gtk_widget_destroy(emfb->vpane); diff --git a/mail/em-migrate.c b/mail/em-migrate.c index 128569edc3..97a05c8a7a 100644 --- a/mail/em-migrate.c +++ b/mail/em-migrate.c @@ -1216,38 +1216,38 @@ em_migrate_setup_progress_dialog (const char *title, const char *desc) /* Install the info image */ w = gtk_image_new_from_stock (GTK_STOCK_DIALOG_INFO, GTK_ICON_SIZE_DIALOG); gtk_misc_set_alignment (GTK_MISC (w), 0.5, 0.0); - gtk_box_pack_start_defaults (GTK_BOX (hbox), w); + gtk_box_pack_start (GTK_BOX (hbox), w, TRUE, TRUE, 0); /* Prepare the message */ vbox = gtk_vbox_new (FALSE, 12); gtk_widget_show (vbox); - gtk_box_pack_start_defaults (GTK_BOX (hbox), vbox); + gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0); w = gtk_label_new (NULL); gtk_misc_set_alignment (GTK_MISC (w), 0.0, 0.0); markup = g_strconcat ("<big><b>", title ? title : _("Migration"), "</b></big>", NULL); gtk_label_set_markup (GTK_LABEL (w), markup); - gtk_box_pack_start_defaults (GTK_BOX (vbox), w); + gtk_box_pack_start (GTK_BOX (vbox), w, TRUE, TRUE, 0); g_free (markup); w = gtk_label_new (desc); gtk_misc_set_alignment (GTK_MISC (w), 0.0, 0.0); gtk_label_set_line_wrap (GTK_LABEL (w), TRUE); - gtk_box_pack_start_defaults (GTK_BOX (vbox), w); + gtk_box_pack_start (GTK_BOX (vbox), w, TRUE, TRUE, 0); /* Progress bar */ w = gtk_vbox_new (FALSE, 6); - gtk_box_pack_start_defaults (GTK_BOX (vbox), w); + gtk_box_pack_start (GTK_BOX (vbox), w, TRUE, TRUE, 0); label = GTK_LABEL (gtk_label_new ("")); gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0); gtk_label_set_line_wrap (label, TRUE); gtk_widget_show (GTK_WIDGET (label)); - gtk_box_pack_start_defaults (GTK_BOX (w), GTK_WIDGET (label)); + gtk_box_pack_start (GTK_BOX (w), GTK_WIDGET (label), TRUE, TRUE, 0); progress = GTK_PROGRESS_BAR (gtk_progress_bar_new ()); gtk_widget_show (GTK_WIDGET (progress)); - gtk_box_pack_start_defaults (GTK_BOX (w), GTK_WIDGET (progress)); + gtk_box_pack_start (GTK_BOX (w), GTK_WIDGET (progress), TRUE, TRUE, 0); gtk_container_add (GTK_CONTAINER (window), hbox); gtk_widget_show_all (hbox); |