← Back to branch summary

~ubuntu-branches/ubuntu/wily/brasero/wily

« back to all changes in this revision

Viewing changes to src/brasero-search-beagle.c

  • Committer: Bazaar Package Importer
  • Author(s): Pedro Fragoso
  • Date: 2008-11-18 11:30:50 UTC
  • mfrom: (1.1.13 upstream)
  • Revision ID: james.westby@ubuntu.com-20081118113050-hoy0pi04uv7ww9d8
Tags: 0.8.3-0ubuntu1
https://launchpad.net/bugs/299411
https://launchpad.net/bugs/273140
https://launchpad.net/bugs/281599
https://launchpad.net/bugs/242022
https://launchpad.net/bugs/280835
https://launchpad.net/bugs/275312
https://launchpad.net/bugs/275086
https://launchpad.net/bugs/282622
https://launchpad.net/bugs/283197
https://launchpad.net/bugs/190192
* New upstream release (LP: #299411)
  - allow use of remote files
  - drives are now probed asynchronously and may not popup immediatly
    but brasero starts faster
  - some parts of GUI were revisited (in particular the burn
    option dialogs)
  - command line option for video projects (LP: #273140)
  - brasero crashed with SIGSEGV in g_main_context_dispatch()
    (LP: #281599)
  - Brasero main GUI appears after closing the dialog
    when opening an ISO file using Nautilus (LP: #242022)
  - brasero delete original files in VIDEO_TS folder (LP: #280835)
  - brasero crashed with SIGSEGV in 
    brasero_mkisofs_base_write_to_files() (LP: #275312)
  - brasero crashed with SIGSEGV in 
    brasero_project_save_project_as() (LP: #275086)
  - brasero crashed with SIGSEGV in 
    IA__g_sequence_iter_get_sequence() (LP: #282622)
  - brasero crashed with SIGSEGV in brasero_medium_get_drive()
    (LP: #283197)
  - Dialog contains a lot of empty space (LP: #190192)
 * debian/patches/008-add-gettext-domain-to-desktop-file.patch:
   - Dropped, we don't need this anymore
 * debian/control:
  - Add Build-deps on libeel2-dev and libnautilus-extension-dev
 * debian/brasero.install:
  - Install nautilus extension

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/brasero-search-beagle.c
301
301
static void
302
302
brasero_search_init (BraseroSearch *obj)
303
303
{
 
304
        gchar *string;
304
305
        GtkWidget *box;
305
306
        GtkWidget *box1;
306
307
        GtkWidget *label;
351
352
        gtk_box_pack_start (GTK_BOX (box), button, FALSE, TRUE, 0);
352
353
        obj->priv->left = button;
353
354
 
354
 
        label = gtk_label_new (_("<b>No results</b>"));
 
355
        string = g_strdup_printf ("<b>%s</b>", _("No results"));
 
356
        label = gtk_label_new (string);
 
357
        g_free (string);
 
358
 
355
359
        gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
356
360
        gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE, 0);
357
361
        obj->priv->results_label = label;
797
801
 
798
802
        if (search->priv->hits_num) {
799
803
                gint last;
 
804
                gchar *tmp;
800
805
 
801
806
                last = search->priv->first_hit + search->priv->max_results;
802
807
                last = last <= search->priv->hits_num ? last : search->priv->hits_num;
803
 
                string = g_strdup_printf (_("<b>Results %i - %i (out of %i)</b>"),
804
 
                                          search->priv->first_hit + 1,
805
 
                                          last,
806
 
                                          search->priv->hits_num);
 
808
                tmp = g_strdup_printf (_("Results %i - %i (out of %i)"),
 
809
                                       search->priv->first_hit + 1,
 
810
                                       last,
 
811
                                       search->priv->hits_num);
 
812
                string = g_strdup_printf ("<b>%s</b>", tmp);
 
813
                g_free (tmp);
807
814
        }
808
815
        else
809
 
                string = g_strdup (_("<b>No results</b>"));
 
816
                string = g_strdup_printf ("<b>%s</b>", _("No results"));
810
817
 
811
818
        gtk_label_set_markup (GTK_LABEL (search->priv->results_label), string);
812
819
        g_free (string);
1037
1044
static void
1038
1045
brasero_search_beagle_error_dialog (BraseroSearch *search, GError *error)
1039
1046
{
1040
 
        GtkWidget *dialog;
1041
1047
        GtkWidget *toplevel;
1042
1048
 
1043
1049
        toplevel = gtk_widget_get_toplevel (GTK_WIDGET (search));
1046
1052
                return;
1047
1053
        }
1048
1054
 
1049
 
        dialog = gtk_message_dialog_new (GTK_WINDOW (toplevel),
1050
 
                                         GTK_DIALOG_DESTROY_WITH_PARENT|
1051
 
                                         GTK_DIALOG_MODAL,
1052
 
                                         GTK_MESSAGE_ERROR,
1053
 
                                         GTK_BUTTONS_CLOSE,
1054
 
                                         _("Error querying beagle:"));
1055
 
 
1056
 
        gtk_window_set_title (GTK_WINDOW (dialog), _("Search Error"));
1057
 
 
1058
 
        gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
1059
 
                                                  error->message);
1060
 
 
1061
 
        gtk_dialog_run (GTK_DIALOG (dialog));
1062
 
        gtk_widget_destroy (dialog);
 
1055
        brasero_utils_message_dialog (toplevel,
 
1056
                                      _("Error querying beagle:"),
 
1057
                                      error->message,
 
1058
                                      GTK_MESSAGE_ERROR);
1063
1059
}
1064
1060
 
1065
1061
static void