GNOME.org
 

[brasero] Fix Bug 632607 - handle combo box text api going away

commit 00a0c549effc998f0afcb4533e33216579c90e8c
Author: Luis Medinas <lmedinas gnome org>
Date:   Thu Oct 21 23:20:56 2010 +0100

    Fix Bug 632607 - handle combo box text api going away
    
    Patch by Matthias Clasen.

 libbrasero-utils/brasero-jacket-background.c |   10 +++++-----
 src/brasero-project.c                        |   14 +++++++-------
 src/brasero-rename.c                         |   22 +++++++++++-----------
 src/brasero-search.c                         |    8 ++++----
 src/brasero-split-dialog.c                   |   10 +++++-----
 5 files changed, 32 insertions(+), 32 deletions(-)
---
diff --git a/libbrasero-utils/brasero-jacket-background.c b/libbrasero-utils/brasero-jacket-background.c
index 184a505..eb7f213 100644
--- a/libbrasero-utils/brasero-jacket-background.c
+++ b/libbrasero-utils/brasero-jacket-background.c
@@ -255,7 +255,7 @@ brasero_jacket_background_init (BraseroJacketBackground *object)
 	gtk_widget_show (hbox2);
 	gtk_box_pack_start (GTK_BOX (vbox2), hbox2, FALSE, TRUE, 0);
 
-	combo = gtk_combo_box_new_text ();
+	combo = gtk_combo_box_text ();
 	priv->color_style = combo;
 	gtk_widget_show (combo);
 	gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("Solid color"));
@@ -339,12 +339,12 @@ brasero_jacket_background_init (BraseroJacketBackground *object)
 			  GTK_FILL,
 			  0, 0);
 
-	combo = gtk_combo_box_new_text ();
+	combo = gtk_combo_box_text_new ();
 	priv->image_style = combo;
 	gtk_widget_show (combo);
-	gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("Centered"));
-	gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("Tiled"));
-	gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("Scaled"));
+	gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), _("Centered"));
+	gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), _("Tiled"));
+	gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), _("Scaled"));
 	gtk_combo_box_set_active (GTK_COMBO_BOX (combo), 0);
 	gtk_table_attach (GTK_TABLE (table),
 			  priv->image_style,
diff --git a/src/brasero-project.c b/src/brasero-project.c
index d0f3871..e953b7b 100644
--- a/src/brasero-project.c
+++ b/src/brasero-project.c
@@ -2730,18 +2730,18 @@ brasero_project_save_project_ask_for_path (BraseroProject *project,
 	 * in plain text a list of the current displayed songs (only in save as
 	 * mode) */
 	if (type && BRASERO_IS_AUDIO_DISC (project->priv->current)) {
-		combo = gtk_combo_box_new_text ();
+		combo = gtk_combo_box_text_new ();
 		gtk_widget_show (combo);
 
-		gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("Save project as a Brasero audio project"));
-		gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("Save project as a plain text list"));
+		gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), _("Save project as a Brasero audio project"));
+		gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), _("Save project as a plain text list"));
 
 #ifdef BUILD_PLAYLIST
 
-		gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("Save project as a PLS playlist"));
-		gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("Save project as an M3U playlist"));
-		gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("Save project as an XSPF playlist"));
-		gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("Save project as an iriver playlist"));
+		gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), _("Save project as a PLS playlist"));
+		gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), _("Save project as an M3U playlist"));
+		gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), _("Save project as an XSPF playlist"));
+		gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), _("Save project as an iriver playlist"));
 
 #endif
 
diff --git a/src/brasero-rename.c b/src/brasero-rename.c
index ee82652..e565c82 100644
--- a/src/brasero-rename.c
+++ b/src/brasero-rename.c
@@ -73,7 +73,7 @@ brasero_rename_set_show_keep_default (BraseroRename *self,
 		if (!priv->show_default)
 			return;
 
-		gtk_combo_box_remove_text (GTK_COMBO_BOX (priv->combo), 0);
+		gtk_combo_box_text_remove (GTK_COMBO_BOX_TEXT (priv->combo), 0);
 
 		/* make sure there is one item active */
 		if (gtk_combo_box_get_active (GTK_COMBO_BOX (priv->combo)) == -1) {
@@ -311,17 +311,17 @@ brasero_rename_init (BraseroRename *object)
 	gtk_notebook_set_show_border (GTK_NOTEBOOK (priv->notebook), FALSE);
 	gtk_notebook_set_show_tabs (GTK_NOTEBOOK (priv->notebook), FALSE);
 
-	priv->combo = gtk_combo_box_new_text ();
+	priv->combo = gtk_combo_box_text_new ();
 	gtk_widget_show (priv->combo);
 	gtk_box_pack_start (GTK_BOX (object), priv->combo, FALSE, FALSE, 0);
 
 	priv->show_default = 1;
-	gtk_combo_box_prepend_text (GTK_COMBO_BOX (priv->combo), _("<Keep current values>"));
-	gtk_combo_box_append_text (GTK_COMBO_BOX (priv->combo), _("Insert text"));
-	gtk_combo_box_append_text (GTK_COMBO_BOX (priv->combo), _("Delete text"));
-	gtk_combo_box_append_text (GTK_COMBO_BOX (priv->combo), _("Substitute text"));
-	gtk_combo_box_append_text (GTK_COMBO_BOX (priv->combo), _("Number files according to a pattern"));
-	gtk_combo_box_append_text (GTK_COMBO_BOX (priv->combo), _("Insert number sequence at beginning"));
+	gtk_combo_box_text_prepend_text (GTK_COMBO_BOX_TEXT (priv->combo), _("<Keep current values>"));
+	gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (priv->combo), _("Insert text"));
+	gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (priv->combo), _("Delete text"));
+	gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (priv->combo), _("Substitute text"));
+	gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (priv->combo), _("Number files according to a pattern"));
+	gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (priv->combo), _("Insert number sequence at beginning"));
 
 	g_signal_connect (priv->combo,
 			  "changed",
@@ -345,16 +345,16 @@ brasero_rename_init (BraseroRename *object)
 	gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0);
 	priv->insert_entry = entry;
 
-	combo = gtk_combo_box_new_text ();
+	combo = gtk_combo_box_text_new ();
 	gtk_widget_show (combo);
 
 	/* Translators: This finishes previous action "Insert". It goes like
 	 * this: "Insert" [Entry] "at the beginning". */
-	gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("at the beginning"));
+	gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), _("at the beginning"));
 
 	/* Translators: This finishes previous action "Insert". It goes like
 	 * this: "Insert" [Entry] "at the end". */
-	gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("at the end"));
+	gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), _("at the end"));
 
 	gtk_combo_box_set_active (GTK_COMBO_BOX (combo), 0);
 	gtk_box_pack_start (GTK_BOX (hbox), combo, FALSE, FALSE, 0);
diff --git a/src/brasero-search.c b/src/brasero-search.c
index e47e96b..af0ec84 100644
--- a/src/brasero-search.c
+++ b/src/brasero-search.c
@@ -1045,14 +1045,14 @@ brasero_search_init (BraseroSearch *obj)
 	label = gtk_label_new (_("Number of results displayed"));
 	gtk_box_pack_start (GTK_BOX (box1), label, FALSE, FALSE, 0);
 
-	combo = gtk_combo_box_new_text ();
+	combo = gtk_combo_box_text_new ();
 	g_signal_connect (combo,
 			  "changed",
 			  G_CALLBACK (brasero_search_max_results_num_changed_cb),
 			  obj);
-	gtk_combo_box_append_text (GTK_COMBO_BOX (combo), "20");
-	gtk_combo_box_append_text (GTK_COMBO_BOX (combo), "50");
-	gtk_combo_box_append_text (GTK_COMBO_BOX (combo), "100");
+	gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), "20");
+	gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), "50");
+	gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), "100");
 
 	gtk_combo_box_set_active (GTK_COMBO_BOX (combo), 1);
 	obj->priv->max_results = 50;
diff --git a/src/brasero-split-dialog.c b/src/brasero-split-dialog.c
index 45fa373..790c450 100644
--- a/src/brasero-split-dialog.c
+++ b/src/brasero-split-dialog.c
@@ -1065,7 +1065,7 @@ brasero_split_dialog_init (BraseroSplitDialog *object)
 	hbox = gtk_hbox_new (FALSE, 6);
 	gtk_widget_show (hbox);
 
-	priv->combo = gtk_combo_box_new_text ();
+	priv->combo = gtk_combo_box_text_new ();
 
 	label = gtk_label_new_with_mnemonic (_("M_ethod:"));
 	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
@@ -1076,10 +1076,10 @@ brasero_split_dialog_init (BraseroSplitDialog *object)
 	gtk_widget_set_tooltip_text (priv->combo, _("Method to be used to split the track"));
 	gtk_widget_show (priv->combo);
 	gtk_box_pack_start (GTK_BOX (hbox), priv->combo, TRUE, TRUE, 0);
-	gtk_combo_box_append_text (GTK_COMBO_BOX (priv->combo), _("Split track manually"));
-	gtk_combo_box_append_text (GTK_COMBO_BOX (priv->combo), _("Split track in parts with a fixed length"));
-	gtk_combo_box_append_text (GTK_COMBO_BOX (priv->combo), _("Split track in a fixed number of parts"));
-	gtk_combo_box_append_text (GTK_COMBO_BOX (priv->combo), _("Split track for each silence"));
+	gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (priv->combo), _("Split track manually"));
+	gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (priv->combo), _("Split track in parts with a fixed length"));
+	gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (priv->combo), _("Split track in a fixed number of parts"));
+	gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (priv->combo), _("Split track for each silence"));
 	g_signal_connect (priv->combo,
 			  "changed",
 			  G_CALLBACK (brasero_split_dialog_combo_changed_cb),
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]