[Merge] lp:~dr3mro/ubuntu/raring/nautilus/fix-1164016 into lp:ubuntu/raring/nautilus
Dr. Amr Osman
dr3mro at gmail.com
Sat Jul 27 23:52:21 UTC 2013
I think you don't need to so that as you can apply the patch and run quilt to generate the quilt patch
but yes i have it , i did create diff from quilt !!
but how i can upload it here ?
and you can try the package in my ppa
ppa:dr3mro/personal
....................................................................
Description: enable_disable_recursive_search
enable disable recursive search
.
nautilus (1:3.6.3-ppa5) raring; urgency=high
.
* remove recursive search
Author: Amr Osman <dr3mro at gmail.com>
---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:
Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: http://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>
Index: nautilus-3.6.3/libnautilus-private/nautilus-search-directory.c
===================================================================
--- nautilus-3.6.3.orig/libnautilus-private/nautilus-search-directory.c 2013-07-27 16:19:39.000000000 +0200
+++ nautilus-3.6.3/libnautilus-private/nautilus-search-directory.c 2013-07-27 16:41:39.216095191 +0200
@@ -37,7 +37,7 @@
#include <gio/gio.h>
#include <string.h>
#include <sys/time.h>
-
+#define NAUTILUS_PREFERENCES_ENABLE_RECURSIVE_SEARCH "enable-recursive-search"
struct NautilusSearchDirectoryDetails {
NautilusQuery *query;
char *saved_search_uri;
@@ -171,8 +171,16 @@
nautilus_search_engine_model_set_model (model_provider, search->details->base_model);
simple_provider = nautilus_search_engine_get_simple_provider (search->details->engine);
- g_object_set (simple_provider, "recursive", TRUE, NULL);
-
+ /*enable / disable recurive search */
+ GSettings *nautilus_preferences;
+ nautilus_preferences = g_settings_new("org.gnome.nautilus.preferences");
+ if (g_settings_get_boolean (nautilus_preferences, NAUTILUS_PREFERENCES_ENABLE_RECURSIVE_SEARCH)) {
+ g_object_set (simple_provider, "recursive", TRUE, NULL);}
+ else
+ {
+ g_object_set (simple_provider, "recursive", FALSE, NULL);
+ }
+ /* patch end */
reset_file_list (search);
nautilus_search_provider_start (NAUTILUS_SEARCH_PROVIDER (search->details->engine));
Index: nautilus-3.6.3/libnautilus-private/org.gnome.nautilus.gschema.xml.in
===================================================================
--- nautilus-3.6.3.orig/libnautilus-private/org.gnome.nautilus.gschema.xml.in 2013-07-27 16:19:39.000000000 +0200
+++ nautilus-3.6.3/libnautilus-private/org.gnome.nautilus.gschema.xml.in 2013-07-27 16:19:39.000000000 +0200
@@ -63,6 +63,11 @@
<_summary>Where to position newly open tabs in browser windows.</_summary>
<_description>If set to "after-current-tab", then new tabs are inserted after the current tab. If set to "end", then new tabs are appended to the end of the tab list.</_description>
</key>
+ <key name="enable-recursive-search" type="b">
+ <default>true</default>
+ <_summary>Whether to enable recursive search or not</_summary>
+ <_description>enables or disables recursive search in nautilus.</_description>
+ </key>
<key name="always-use-location-entry" type="b">
<default>false</default>
<_summary>Always use the location entry, instead of the pathbar</_summary>
--
https://code.launchpad.net/~dr3mro/ubuntu/raring/nautilus/fix-1164016/+merge/177266
Your team Ubuntu branches is requested to review the proposed merge of lp:~dr3mro/ubuntu/raring/nautilus/fix-1164016 into lp:ubuntu/raring/nautilus.
More information about the Ubuntu-reviews
mailing list