Updating branch refs/heads/stephan/gtk3 to 906751cac4a9799a1694adf27e2d4a2a052538c0 (commit) from 4014cd12e2b81329940f0670f23096e54f2f78fe (commit)
commit 906751cac4a9799a1694adf27e2d4a2a052538c0 Author: Stephan Arts <step...@xfce.org> Date: Thu May 3 00:16:58 2012 +0200 Port RsttoPreferencesDialog to gtk-3 src/preferences_dialog.c | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/preferences_dialog.c b/src/preferences_dialog.c index f7f6ec4..c1c2598 100644 --- a/src/preferences_dialog.c +++ b/src/preferences_dialog.c @@ -475,24 +475,27 @@ rstto_preferences_dialog_init ( RsttoPreferencesDialog *dialog ) FALSE, 0); dialog->priv->behaviour_tab.choose_desktop_combo_box = - gtk_combo_box_new_text(); + gtk_combo_box_text_new(); gtk_box_pack_start ( GTK_BOX (dialog->priv->behaviour_tab.desktop_vbox), dialog->priv->behaviour_tab.choose_desktop_combo_box, FALSE, FALSE, 0); - gtk_combo_box_insert_text( - GTK_COMBO_BOX (dialog->priv->behaviour_tab.choose_desktop_combo_box), + gtk_combo_box_text_insert ( + GTK_COMBO_BOX_TEXT (dialog->priv->behaviour_tab.choose_desktop_combo_box), DESKTOP_TYPE_NONE, + NULL, _("None")); - gtk_combo_box_insert_text ( - GTK_COMBO_BOX (dialog->priv->behaviour_tab.choose_desktop_combo_box), + gtk_combo_box_text_insert ( + GTK_COMBO_BOX_TEXT (dialog->priv->behaviour_tab.choose_desktop_combo_box), DESKTOP_TYPE_XFCE, + NULL, _("Xfce")); - gtk_combo_box_insert_text ( - GTK_COMBO_BOX (dialog->priv->behaviour_tab.choose_desktop_combo_box), + gtk_combo_box_text_insert ( + GTK_COMBO_BOX_TEXT (dialog->priv->behaviour_tab.choose_desktop_combo_box), DESKTOP_TYPE_GNOME, + NULL, _("GNOME")); if (str_desktop_type != NULL) @@ -534,7 +537,7 @@ rstto_preferences_dialog_init ( RsttoPreferencesDialog *dialog ) dialog); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), notebook); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), notebook); gtk_widget_show_all (notebook); /* Window should not be resizable */ _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits