[gnac/infobar] Fixed a bug in libgnac-converter.c. The 'overwrite' signal must be sent on reception of the GST_RESO

[Benoît Dupasquier <bdupasqu src gnome org>]

commit 5a5ed30258c24465698d1acdedc0e20b07ca9073
Author: Benoît Dupasquier <bdupasqu src gnome org>
Date:   Mon Dec 21 11:52:57 2009 +0100

    Fixed a bug in libgnac-converter.c. The 'overwrite' signal must be sent on reception of the GST_RESOURCE_ERROR_OPEN_WRITE error.

 libgnac/libgnac-converter.c |   16 ++++++++++------
 src/gnac-main.c             |   24 +++++++++++-------------
 src/gnac-ui.c               |    9 ++++-----
 3 files changed, 25 insertions(+), 24 deletions(-)
---
diff --git a/libgnac/libgnac-converter.c b/libgnac/libgnac-converter.c
index ac71591..9ba3cfe 100644
--- a/libgnac/libgnac-converter.c
+++ b/libgnac/libgnac-converter.c
@@ -302,10 +302,11 @@ libgnac_converter_set_property(GObject      *object,
 
 
 static gboolean
-libgnac_converter_allow_overwrite_accumulator(GSignalInvocationHint *ihint,
-                                             GValue                *return_accu,
-                                             const GValue          *handler_return,
-                                             gpointer data)
+libgnac_converter_allow_overwrite_accumulator(
+    GSignalInvocationHint *ihint,
+    GValue                *return_accu,
+    const GValue          *handler_return,
+    gpointer data)
 {
   gboolean allow_overwrite;
 
@@ -1060,7 +1061,7 @@ libgnac_converter_error_cb(GstBus      *bus,
 
     } else if (g_error_matches(error,
                   GST_RESOURCE_ERROR,
-                  GST_RESOURCE_ERROR_OPEN_READ))
+                  GST_RESOURCE_ERROR_OPEN_WRITE))
     {
       if (g_file_test(g_file_get_path(item->destination), G_FILE_TEST_EXISTS))
       {
@@ -1115,7 +1116,10 @@ libgnac_converter_error_cb(GstBus      *bus,
                     _("An error occured during conversion"), error);
   }
 
-  libgnac_warning("Conversion failed:\n\tFile: %s\n\tBin name: %s\n\tError message: %s", 
+  libgnac_warning("Conversion failed:\n"
+                  "\tFile: %s\n"
+                  "\tBin name: %s\n"
+                  "\tError message: %s",
                   uri, name, error->message);
 
   g_clear_error(&error);
diff --git a/src/gnac-main.c b/src/gnac-main.c
index 7d447ac..529db3e 100644
--- a/src/gnac-main.c
+++ b/src/gnac-main.c
@@ -689,52 +689,50 @@ gnac_on_converter_overwrite_cb(LibgnacConverter *converter,
   GFileInfo *info;
   GError *error = NULL;
 
-  g_print("prout\n");
-
   uri = (GFile*) file;
   info = g_file_query_info(uri, G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME,
-          G_FILE_QUERY_INFO_NONE, NULL, &error);
-
+      G_FILE_QUERY_INFO_NONE, NULL, &error);
 
   if (!remember_overwrite) 
   {
+    gchar     *message;
     GtkWidget *vbox;
     GtkWidget *checkbutton;
     GtkWidget *info_bar;
     GtkWidget *content_area;
     GtkWidget *label;
-    gchar *message;
   
     info_bar = gnac_ui_get_widget("info_bar");
 
     message = g_strdup_printf(_("File %s already exists\n Overwrite?"),
-      g_file_info_get_display_name(info));
+        g_file_info_get_display_name(info));
     label = gtk_label_new(message);
-    gtk_widget_show(GTK_WIDGET(label));
+    gtk_widget_show(label);
 
     checkbutton = gtk_check_button_new_with_label(_("Remember my decision"));
-    gtk_widget_show(GTK_WIDGET(checkbutton));
+    gtk_widget_show(checkbutton);
 
     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), FALSE);
     vbox = gtk_vbox_new(FALSE, 6);
-    gtk_widget_show(GTK_WIDGET(vbox));
+    gtk_widget_show(vbox);
 
     gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
     gtk_box_pack_start(GTK_BOX(vbox), checkbutton, FALSE, FALSE, 0);
 
     content_area = gtk_info_bar_get_content_area(GTK_INFO_BAR(info_bar));
     gtk_info_bar_set_message_type(GTK_INFO_BAR(info_bar), GTK_MESSAGE_QUESTION);
-    gtk_info_bar_add_buttons(GTK_INFO_BAR(info_bar), GTK_STOCK_NO, GTK_RESPONSE_NO, GTK_STOCK_YES, GTK_RESPONSE_YES, NULL);
+    gtk_info_bar_add_buttons(GTK_INFO_BAR(info_bar),
+        GTK_STOCK_NO, GTK_RESPONSE_NO,
+        GTK_STOCK_YES, GTK_RESPONSE_YES,
+        NULL);
 
     gtk_container_add (GTK_CONTAINER(content_area), vbox);
 
-
     g_signal_connect (info_bar, "response",
-                  G_CALLBACK (gtk_widget_hide), checkbutton);
+        G_CALLBACK (gtk_widget_hide), checkbutton);
 
     gtk_widget_show(info_bar);
 
-
     // TODO
     //remember_overwrite = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(checkbutton));
 
diff --git a/src/gnac-ui.c b/src/gnac-ui.c
index b18fed4..c071434 100644
--- a/src/gnac-ui.c
+++ b/src/gnac-ui.c
@@ -67,9 +67,9 @@ extern GnacState state;
 void
 gnac_ui_new(void)
 {
-  GtkInfoBar *info_bar;
   gchar     *current_profile;
   GtkWidget *file_list;
+  GtkWidget *info_bar;
   GtkWidget *audio_profile_hbox;
   GError    *err = NULL;
 
@@ -116,10 +116,9 @@ gnac_ui_new(void)
       audio_profile_edit_button, 
       FALSE, TRUE, 6);
 
-
-  info_bar = GTK_INFO_BAR(gtk_builder_get_object(gnac_main_builder, "info_bar"));
-  gtk_widget_set_no_show_all (GTK_WIDGET(info_bar), TRUE);
-  gtk_widget_show(GTK_WIDGET(info_bar));
+  info_bar = GTK_WIDGET(gtk_builder_get_object(gnac_main_builder, "info_bar"));
+  gtk_widget_set_no_show_all(info_bar, TRUE);
+  gtk_widget_show(info_bar);
 
   /* DnD portion code */