gnome-split-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 4
committer: Guillaume Mazoyer <respawneral@xxxxxxxxx>
branch nick: nautilus-gnome-split
timestamp: Sun 2012-01-22 12:23:05 +0100
message:
  Display 'Merge Files...' entry only when files are mergeable.
modified:
  po/nautilus-gnome-split.pot
  src/nautilus-gnome-split.c


--
lp:~gnome-split-team/gnome-split/nautilus-extension
https://code.launchpad.net/~gnome-split-team/gnome-split/nautilus-extension

Your team GNOME Split developers is subscribed to branch lp:~gnome-split-team/gnome-split/nautilus-extension.
To unsubscribe from this branch go to https://code.launchpad.net/~gnome-split-team/gnome-split/nautilus-extension/+edit-subscription

=== modified file 'po/nautilus-gnome-split.pot'
--- po/nautilus-gnome-split.pot	2012-01-22 00:51:16 +0000
+++ po/nautilus-gnome-split.pot	2012-01-22 11:23:05 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-22 01:47+0100\n"
+"POT-Creation-Date: 2012-01-22 12:19+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -17,18 +17,18 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/nautilus-gnome-split.c:90
+#: ../src/nautilus-gnome-split.c:107
 msgid "_Merge Files..."
 msgstr ""
 
-#: ../src/nautilus-gnome-split.c:91
+#: ../src/nautilus-gnome-split.c:108
 msgid "Merge all files together"
 msgstr ""
 
-#: ../src/nautilus-gnome-split.c:98
+#: ../src/nautilus-gnome-split.c:115
 msgid "_Split File..."
 msgstr ""
 
-#: ../src/nautilus-gnome-split.c:99
+#: ../src/nautilus-gnome-split.c:116
 msgid "Split this file"
 msgstr ""

=== modified file 'src/nautilus-gnome-split.c'
--- src/nautilus-gnome-split.c	2012-01-22 03:16:20 +0000
+++ src/nautilus-gnome-split.c	2012-01-22 11:23:05 +0000
@@ -41,27 +41,23 @@
 static GType gnome_split_type = 0;
 
 static gboolean gnome_split_file_is_mergeable(NautilusFileInfo* file_info) {
-	gchar*   uri_scheme;
-	gchar*   mime_type;
-	gboolean mergeable;
-	
-	mergeable  = TRUE;
-	uri_scheme = nautilus_file_info_get_uri_scheme(file_info);
-	mime_type  = nautilus_file_info_get_mime_type(file_info);
-
-	if (strcmp(uri_scheme, "file") != 0) {
-		mergeable = FALSE;
-	}
-
-	g_free(uri_scheme);
-
-	if (strncmp (mime_type, "image/", 6) != 0) {
-		mergeable = FALSE;
-	}
-
-	g_free(mime_type);
-	
-	return mergeable;
+    gchar*   mime_type;
+    gboolean mergeable;
+
+    mergeable = FALSE;
+    mime_type = nautilus_file_info_get_mime_type(file_info);
+
+    if ((strcmp(mime_type, "application/x-extension-xtm") == 0) ||
+        (strcmp(mime_type, "application/x-extension-gsp") == 0) ||
+        (strcmp(mime_type, "application/x-extension-yct") == 0) ||
+        (strcmp(mime_type, "application/x-extension-kk")  == 0) ||
+        (strcmp(mime_type, "application/x-generic-chunk") == 0)) {
+        mergeable = TRUE;
+    }
+
+    g_free(mime_type);
+
+    return mergeable;
 }
 
 static void gnome_split_merge_callback(NautilusMenuItem* item, GList* files) {
@@ -122,14 +118,14 @@
             g_signal_connect(item, "activate",
                         G_CALLBACK(gnome_split_split_callback),
                         nautilus_file_info_list_copy(files));
-		}
+        }
 
         items = g_list_append(items, item);
 
         return items;
     }
 	
-	return NULL;
+    return NULL;
 }
 
 static void nautilus_gnome_split_menu_provider_iface_init(
@@ -167,7 +163,7 @@
         NULL
     };
 
-	gnome_split_type = g_type_module_register_type(module, G_TYPE_OBJECT,
+    gnome_split_type = g_type_module_register_type(module, G_TYPE_OBJECT,
                 "NautilusGnomeSplit", &info, 0);
 
     g_type_module_add_interface(module, gnome_split_type,