From 9cc64a2009458355ed1e404ca4e15ede10acd920 Mon Sep 17 00:00:00 2001 From: Andre Klapper Date: Wed, 11 Feb 2009 16:06:24 +0000 Subject: Substitute some deprecated gtk+ functions. 2009-02-11 Andre Klapper * addressbook/gui/component/addressbook-migrate.c: * calendar/gui/migration.c: * calendar/gui/dialogs/alarm-dialog.c: * mail/em-folder-browser.c: * mail/em-migrate.c: * plugins/audio-inline/audio-inline.c: Substitute some deprecated gtk+ functions. svn path=/trunk/; revision=37249 --- addressbook/ChangeLog | 5 +++++ addressbook/gui/component/addressbook-migrate.c | 8 ++++---- calendar/ChangeLog | 6 ++++++ calendar/gui/dialogs/alarm-dialog.c | 2 +- calendar/gui/migration.c | 8 ++++---- mail/ChangeLog | 6 ++++++ mail/em-folder-browser.c | 4 ++-- mail/em-migrate.c | 14 +++++++------- plugins/audio-inline/ChangeLog | 5 +++++ plugins/audio-inline/audio-inline.c | 2 +- 10 files changed, 41 insertions(+), 19 deletions(-) diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 84d5a3f9ca..456f00cb51 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,8 @@ +2009-02-11 Andre Klapper + + * /gui/component/addressbook-migrate.c: + Substitute some deprecated gtk+ functions. + 2009-01-26 Matthew Barnes * printing/test-print.c: diff --git a/addressbook/gui/component/addressbook-migrate.c b/addressbook/gui/component/addressbook-migrate.c index 237b4cb80a..09d1a1af9f 100644 --- a/addressbook/gui/component/addressbook-migrate.c +++ b/addressbook/gui/component/addressbook-migrate.c @@ -82,19 +82,19 @@ setup_progress_dialog (MigrationContext *context) context->label = gtk_label_new (""); gtk_label_set_line_wrap (GTK_LABEL (context->label), TRUE); gtk_widget_show (context->label); - gtk_box_pack_start_defaults (GTK_BOX (vbox), context->label); + gtk_box_pack_start (GTK_BOX (vbox), context->label, TRUE, TRUE, 0); hbox = gtk_hbox_new (FALSE, 6); gtk_widget_show (hbox); - gtk_box_pack_start_defaults (GTK_BOX (vbox), hbox); + gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0); context->folder_label = gtk_label_new (""); gtk_widget_show (context->folder_label); - gtk_box_pack_start_defaults (GTK_BOX (hbox), context->folder_label); + gtk_box_pack_start (GTK_BOX (hbox), context->folder_label, TRUE, TRUE, 0); context->progress = gtk_progress_bar_new (); gtk_widget_show (context->progress); - gtk_box_pack_start_defaults (GTK_BOX (hbox), context->progress); + gtk_box_pack_start (GTK_BOX (hbox), context->progress, TRUE, TRUE, 0); gtk_widget_show (context->window); } diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 0f3131fbd3..e8782a52b4 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,9 @@ +2009-02-11 Andre Klapper + + * /gui/migration.c: + * /gui/dialogs/alarm-dialog.c: + Substitute some deprecated gtk+ functions. + 2009-02-09 Milan Crha * gui/dialogs/cal-prefs-dialog.glade: diff --git a/calendar/gui/dialogs/alarm-dialog.c b/calendar/gui/dialogs/alarm-dialog.c index bf78f70011..2f1393d70f 100644 --- a/calendar/gui/dialogs/alarm-dialog.c +++ b/calendar/gui/dialogs/alarm-dialog.c @@ -863,7 +863,7 @@ setup_select_names (Dialog *dialog) dialog->malarm_addresses = GTK_WIDGET (e_name_selector_peek_section_entry (dialog->name_selector, section_name)); gtk_widget_show (dialog->malarm_addresses); - gtk_box_pack_end_defaults (GTK_BOX (dialog->malarm_address_group), dialog->malarm_addresses); + gtk_box_pack_end (GTK_BOX (dialog->malarm_address_group), dialog->malarm_addresses, TRUE, TRUE, 0); g_signal_connect (G_OBJECT (dialog->malarm_addressbook), "clicked", G_CALLBACK (addressbook_clicked_cb), dialog); diff --git a/calendar/gui/migration.c b/calendar/gui/migration.c index b6174202d2..80d58b67fd 100644 --- a/calendar/gui/migration.c +++ b/calendar/gui/migration.c @@ -164,19 +164,19 @@ setup_progress_dialog (gboolean tasks) gtk_label_set_line_wrap ((GtkLabel *) w, TRUE); gtk_widget_show (w); - gtk_box_pack_start_defaults ((GtkBox *) vbox, w); + gtk_box_pack_start ((GtkBox *) vbox, w, TRUE, TRUE, 0); hbox = gtk_hbox_new (FALSE, 6); gtk_widget_show (hbox); - gtk_box_pack_start_defaults ((GtkBox *) vbox, hbox); + gtk_box_pack_start ((GtkBox *) vbox, hbox, TRUE, TRUE, 0); label = (GtkLabel *) gtk_label_new (""); gtk_widget_show ((GtkWidget *) label); - gtk_box_pack_start_defaults ((GtkBox *) hbox, (GtkWidget *) label); + gtk_box_pack_start ((GtkBox *) hbox, (GtkWidget *) label, TRUE, TRUE, 0); progress = (GtkProgressBar *) gtk_progress_bar_new (); gtk_widget_show ((GtkWidget *) progress); - gtk_box_pack_start_defaults ((GtkBox *) hbox, (GtkWidget *) progress); + gtk_box_pack_start ((GtkBox *) hbox, (GtkWidget *) progress, TRUE, TRUE, 0); gtk_widget_show (window); } 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 + + * em-folder-browser.c: + * em-migrate.c: + Substitute some deprecated gtk+ functions. + 2009-02-11 Milan Crha ** 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 ("", title ? title : _("Migration"), "", 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); diff --git a/plugins/audio-inline/ChangeLog b/plugins/audio-inline/ChangeLog index 7ec5b04a59..374d489fbe 100644 --- a/plugins/audio-inline/ChangeLog +++ b/plugins/audio-inline/ChangeLog @@ -1,3 +1,8 @@ +2009-02-11 Andre Klapper + + * audio-inline.c: + Substitute some deprecated gtk+ functions. + 2008-10-03 Sankar P License Changes diff --git a/plugins/audio-inline/audio-inline.c b/plugins/audio-inline/audio-inline.c index 2568117b5a..67280e54c4 100644 --- a/plugins/audio-inline/audio-inline.c +++ b/plugins/audio-inline/audio-inline.c @@ -263,7 +263,7 @@ org_gnome_audio_inline_add_button (GtkWidget *box, const char *stock_icon, GCall g_signal_connect (button, "clicked", cb, data); gtk_widget_show (button); - gtk_box_pack_end_defaults (GTK_BOX (box), button); + gtk_box_pack_end (GTK_BOX (box), button, TRUE, TRUE, 0); return button; } -- cgit v1.2.3