[gnac] Fix forgotten bugs

[David Joaquim <djoaquim src gnome org>]

commit ecc4cb747570a1dc27c3c58404cd7f09a30ab8f9
Author: David Joaquim <djoaquim src gnome org>
Date:   Fri May 7 20:02:33 2010 +0200

    Fix forgotten bugs

 libgnac/libgnac-converter.c |   65 -------------------------------------------
 src/gnac-properties.h       |    4 --
 src/gnac-ui.c               |    2 +-
 3 files changed, 1 insertions(+), 70 deletions(-)
---
diff --git a/libgnac/libgnac-converter.c b/libgnac/libgnac-converter.c
index c6cf361..6ab012d 100644
--- a/libgnac/libgnac-converter.c
+++ b/libgnac/libgnac-converter.c
@@ -1169,70 +1169,6 @@ libgnac_converter_error_cb(GstBus      *bus,
   name = GST_MESSAGE_SRC_NAME(message);
   gst_message_parse_error(message, &error, NULL);
 
-<<<<<<< HEAD
-  if (g_str_has_prefix(name, "giosink"))
-  {
-    if (g_error_matches(error, 
-            GST_RESOURCE_ERROR, 
-            GST_RESOURCE_ERROR_NOT_FOUND)) 
-    {
-      /* Create missing directory */
-      GError *err = NULL;
-      GFile *folder;
-
-      folder = g_file_get_parent(item->destination);
-      g_file_make_directory_with_parents(folder, NULL, &err);
-      g_object_unref(folder);
-      if (err) {
-        g_signal_emit(item->converter, signals[ERROR], 0, uri, 
-                        _("Unable to create destination directory"), NULL);
-        g_clear_error(&err);
-      } else if (libgnac_converter_restart_current(item->converter)) return;
-
-    } else if (g_error_matches(error,
-                  GST_RESOURCE_ERROR,
-                  GST_RESOURCE_ERROR_OPEN_WRITE))
-    {
-      if (g_file_test(g_file_get_path(item->destination), G_FILE_TEST_EXISTS))
-      {
-        gboolean overwrite = FALSE;
-        g_signal_emit(item->converter, signals[OVERWRITE], 0, 
-                        item->destination, &overwrite);
-        if (overwrite)
-        {
-          GError *err = NULL;
-          g_file_delete(item->destination, NULL, &err);
-          if (err) {
-            libgnac_debug("Unable to overwrite file %s: %s", uri, err->message);
-            g_clear_error(&err);
-          }
-          if (!err && libgnac_converter_restart_current(item->converter)) 
-          {
-            g_clear_error(&error);
-            g_free(name);
-            g_free(uri);
-            return;
-          }
-        }
-        else 
-        {
-          gchar  *msg;
-          GError *err = NULL;
-          msg = g_strdup_printf(_("Destination file %s already exists"), uri);
-          g_set_error_literal(&err, LIBGNAC_ERROR, 
-              LIBGNAC_ERROR_FILE_EXISTS, msg);
-          g_signal_emit(item->converter, signals[ERROR], 0, uri, msg, err);
-          g_clear_error(&err);
-          g_free(msg);
-        }
-      } 
-      else
-      {
-        g_signal_emit(item->converter, signals[ERROR], 0, uri, 
-                          _("Unable to access destination file"), error);
-      }
-    }
-=======
   libgnac_debug("An error has occured:\n"
                 "\tFile: %s\n"
                 "\tOut file %s\n"
@@ -1247,7 +1183,6 @@ libgnac_converter_error_cb(GstBus      *bus,
     restart = libgnac_converter_error_sink(item, message, uri, error);
     /* restore the normal state of the bus */
     gst_bus_set_flushing(bus, FALSE);
->>>>>>> devel
   } else if (g_str_has_prefix(name, "giosrc")) {
     libgnac_debug("Source error");
     restart = libgnac_converter_error_src(item, message, uri, error);
diff --git a/src/gnac-properties.h b/src/gnac-properties.h
index 78d62d5..f7a9493 100644
--- a/src/gnac-properties.h
+++ b/src/gnac-properties.h
@@ -79,11 +79,7 @@ gnac_on_close_properties(GtkWidget *widget,
 gboolean
 gnac_properties_on_delete_event(GtkWidget *widget,
                                 GdkEvent  *event,
-<<<<<<< HEAD
-                                gpointer   data);
-=======
                                 gpointer   user_data);
->>>>>>> devel
 
 void
 gnac_properties_destroy(void);
diff --git a/src/gnac-ui.c b/src/gnac-ui.c
index 2532227..c232bb6 100644
--- a/src/gnac-ui.c
+++ b/src/gnac-ui.c
@@ -500,10 +500,10 @@ gnac_ui_on_trayicon_popup(GtkStatusIcon *trayicon,
 void
 gnac_ui_trayicon_tooltip_update(const gchar *tooltip)
 {
+  /* TODO check this
   gchar *tmp = NULL;
   GdkDisplay *display;
   
-  /* TODO check this
   tmp = tooltip_path;
   tooltip_path = g_strdup(tooltip);
   display = gdk_display_get_default();