Merge pull request #42 from jasmineaura/develop

Bring Caja up to speed, stage1

1 files changed, 3 insertions, 15 deletions

diff --git a/libcaja-private/caja-mime-application-chooser.c b/libcaja-private/caja-mime-application-chooser.c
index 3f458dba..dd8af544 100644
--- a/libcaja-private/caja-mime-application-chooser.c
+++ b/libcaja-private/caja-mime-application-chooser.c
@@ -32,8 +32,6 @@
 #include "caja-signaller.h"
 #include "caja-file.h"
 #include <eel/eel-stock-dialogs.h>
-#include <eel/eel-glib-extensions.h>
-#include <eel/eel-string.h>
 
 #include <string.h>
 #include <glib/gi18n-lib.h>
@@ -108,22 +106,12 @@ caja_mime_application_chooser_finalize (GObject *object)
 }
 
 static void
-caja_mime_application_chooser_destroy (GtkObject *object)
-{
-    GTK_OBJECT_CLASS (caja_mime_application_chooser_parent_class)->destroy (object);
-}
-
-static void
 caja_mime_application_chooser_class_init (CajaMimeApplicationChooserClass *class)
 {
     GObjectClass *gobject_class;
-    GtkObjectClass *object_class;
 
     gobject_class = G_OBJECT_CLASS (class);
     gobject_class->finalize = caja_mime_application_chooser_finalize;
-
-    object_class = GTK_OBJECT_CLASS (class);
-    object_class->destroy = caja_mime_application_chooser_destroy;
 }
 
 static void
@@ -575,7 +563,8 @@ refresh_model (CajaMimeApplicationChooser *chooser)
         g_object_unref (default_app);
     }
 
-    eel_g_object_list_free (applications);
+    g_list_foreach(applications, (GFunc) g_object_unref, NULL);
+    g_list_free(applications);
 }
 
 static void
@@ -683,8 +672,7 @@ set_uri_and_type_for_multiple_files (CajaMimeApplicationChooser *chooser,
         char *extension_current;
 
         extension_current = get_extension_from_file (CAJA_FILE (iter->data));
-        if (eel_strcmp (first_extension, extension_current))
-        {
+        if (g_strcmp0 (first_extension, extension_current)) {
             same_extension = FALSE;
             g_free (extension_current);
             break;