← Back to branch summary

~ubuntu-branches/ubuntu/vivid/brasero/vivid-proposed

« back to all changes in this revision

Viewing changes to src/brasero-rename.c

  • Committer: Bazaar Package Importer
  • Author(s): Rodrigo Moya
  • Date: 2011-05-18 17:53:39 UTC
  • mfrom: (1.1.47 upstream) (1.4.3 experimental)
  • Revision ID: james.westby@ubuntu.com-20110518175339-so6a6fejezs5i1pc
Tags: 3.0.0-1ubuntu1
* Rebase from Debian and GNOME3 PPA. Remaining Ubuntu changes:
* debian/control:
  - Build-Depend on dh-autoreconf, libappindicator3-dev and
    liblaunchpad-integration-3.0-dev
  - Recommends: brasero-cdrkit
  - libbrasero-media3-1 Depends on dvd+rw-tools not growisofs and
    Suggests rather than Recommends gstreamer plugin packages
* debian/patches/010_lpi.patch:
  - Launchpad integration patch
* debian/patches/012_appindicator.patch:
  - Use application indicators
* debian/rules:
  - Include autoreconf.mk
* debian/watch:
  - Watch unstable releases also

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/brasero-rename.c
73
73
                if (!priv->show_default)
74
74
                        return;
75
75
 
76
 
                gtk_combo_box_remove_text (GTK_COMBO_BOX (priv->combo), 0);
 
76
                gtk_combo_box_text_remove (GTK_COMBO_BOX_TEXT (priv->combo), 0);
77
77
 
78
78
                /* make sure there is one item active */
79
79
                if (gtk_combo_box_get_active (GTK_COMBO_BOX (priv->combo)) == -1) {
86
86
                if (priv->show_default)
87
87
                        return;
88
88
 
89
 
                gtk_combo_box_prepend_text (GTK_COMBO_BOX (priv->combo),
90
 
                                             _("<Keep current values>"));
 
89
                gtk_combo_box_text_prepend_text  (GTK_COMBO_BOX_TEXT (priv->combo),
 
90
                                                  _("<Keep current values>"));
91
91
        }
92
92
 
93
93
        priv->show_default = show;
174
174
                                guint nb_items)
175
175
{
176
176
        BraseroRenamePrivate *priv;
177
 
        gboolean is_at_end;
178
177
 
179
178
        priv = BRASERO_RENAME_PRIVATE (self);
180
179
 
181
 
        is_at_end = gtk_combo_box_get_active (GTK_COMBO_BOX (priv->insert_combo)) != 0;
 
180
        if (!gtk_combo_box_get_active (GTK_COMBO_BOX (priv->insert_combo)))
 
181
                return NULL;
182
182
 
183
183
        if (nb_items < 10){
184
184
                return g_strdup_printf ("%i%s", item_num, name);
311
311
        gtk_notebook_set_show_border (GTK_NOTEBOOK (priv->notebook), FALSE);
312
312
        gtk_notebook_set_show_tabs (GTK_NOTEBOOK (priv->notebook), FALSE);
313
313
 
314
 
        priv->combo = gtk_combo_box_new_text ();
 
314
        priv->combo = gtk_combo_box_text_new ();
315
315
        gtk_widget_show (priv->combo);
316
316
        gtk_box_pack_start (GTK_BOX (object), priv->combo, FALSE, FALSE, 0);
317
317
 
318
318
        priv->show_default = 1;
319
 
        gtk_combo_box_prepend_text (GTK_COMBO_BOX (priv->combo), _("<Keep current values>"));
320
 
        gtk_combo_box_append_text (GTK_COMBO_BOX (priv->combo), _("Insert text"));
321
 
        gtk_combo_box_append_text (GTK_COMBO_BOX (priv->combo), _("Delete text"));
322
 
        gtk_combo_box_append_text (GTK_COMBO_BOX (priv->combo), _("Substitute text"));
323
 
        gtk_combo_box_append_text (GTK_COMBO_BOX (priv->combo), _("Number files according to a pattern"));
324
 
        gtk_combo_box_append_text (GTK_COMBO_BOX (priv->combo), _("Insert number sequence at beginning"));
 
319
        gtk_combo_box_text_prepend_text (GTK_COMBO_BOX_TEXT (priv->combo), _("<Keep current values>"));
 
320
        gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (priv->combo), _("Insert text"));
 
321
        gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (priv->combo), _("Delete text"));
 
322
        gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (priv->combo), _("Substitute text"));
 
323
        gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (priv->combo), _("Number files according to a pattern"));
 
324
        gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (priv->combo), _("Insert number sequence at beginning"));
325
325
 
326
326
        g_signal_connect (priv->combo,
327
327
                          "changed",
345
345
        gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0);
346
346
        priv->insert_entry = entry;
347
347
 
348
 
        combo = gtk_combo_box_new_text ();
 
348
        combo = gtk_combo_box_text_new ();
349
349
        gtk_widget_show (combo);
350
350
 
351
351
        /* Translators: This finishes previous action "Insert". It goes like
352
352
         * this: "Insert" [Entry] "at the beginning". */
353
 
        gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("at the beginning"));
 
353
        gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), _("at the beginning"));
354
354
 
355
355
        /* Translators: This finishes previous action "Insert". It goes like
356
356
         * this: "Insert" [Entry] "at the end". */
357
 
        gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("at the end"));
 
357
        gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), _("at the end"));
358
358
 
359
359
        gtk_combo_box_set_active (GTK_COMBO_BOX (combo), 0);
360
360
        gtk_box_pack_start (GTK_BOX (hbox), combo, FALSE, FALSE, 0);