diff -u nautilus-2.26.2/debian/changelog nautilus-2.26.2/debian/changelog --- nautilus-2.26.2/debian/changelog +++ nautilus-2.26.2/debian/changelog @@ -1,3 +1,9 @@ +nautilus (1:2.26.2-0ubuntu2) jaunty; urgency=low + + * re-enable the mime search functionality + + -- Michael Vogt Thu, 16 Apr 2009 14:51:09 +0200 + nautilus (1:2.26.2-0ubuntu1) jaunty; urgency=low * New upstream version diff -u nautilus-2.26.2/debian/patches/series nautilus-2.26.2/debian/patches/series --- nautilus-2.26.2/debian/patches/series +++ nautilus-2.26.2/debian/patches/series @@ -13,6 +13,7 @@ 16_workaround_autorestart_issue.patch 17_no_autorun_launcher.patch 80_suppress_umount_in_ltsp.patch +82_gnome-app-install.patch 95_no-initial-fade.patch 99_ltmain_as-needed.patch only in patch2: unchanged: --- nautilus-2.26.2.orig/debian/patches/82_gnome-app-install.patch +++ nautilus-2.26.2/debian/patches/82_gnome-app-install.patch @@ -0,0 +1,45 @@ +Index: nautilus-2.26.2/libnautilus-private/nautilus-mime-actions.c +=================================================================== +--- nautilus-2.26.2.orig/libnautilus-private/nautilus-mime-actions.c 2009-04-16 14:52:09.000000000 +0200 ++++ nautilus-2.26.2/libnautilus-private/nautilus-mime-actions.c 2009-04-16 15:06:02.000000000 +0200 +@@ -1375,6 +1375,27 @@ + g_object_unref (proxy); + } + ++void launch_gnome_app_install_mimetype(GdkScreen *screen, ++ NautilusFile *file, ++ char *uri) { ++ char *qmimetype, *quri, *qduri, *command; ++ if (!screen) ++ screen = gdk_display_get_default_screen(gdk_display_get_default ()); ++ ++ qmimetype = g_shell_quote (nautilus_file_info_get_mime_type (file)); ++ quri = g_shell_quote (uri); ++ command = g_strconcat("gnome-app-install --mime-type=", ++ qmimetype, " ", quri, ++ (char*)0 /* NB NULL is wrong */); ++ g_free (qmimetype); ++ g_free (quri); ++ g_free (qduri); ++ ++ //eel_gnome_shell_execute_on_screen (command, screen); ++ gdk_spawn_command_line_on_screen (screen, command, NULL); ++ g_free (command); ++} ++ + static void + application_unhandled_uri (ActivateParameters *parameters, char *uri) + { +@@ -1423,6 +1444,12 @@ + goto out; + } + ++ // try g-a-i now ++ if (g_find_program_in_path("gnome-app-install")) { ++ launch_gnome_app_install_mimetype(NULL, file, uri); ++ goto out; ++ } ++ + /* Check whether PackageKit can be spawned */ + connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error); + if (connection == NULL) {