pool/nautilus
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 158743 from GNOME:Next

Browse Source 
The search-provider is no longer a stand-alone binary, but integrated part of nautilus.. I wasn't sure about that when I packaged nautilus.. hence I kept the libexecdir binary as a reminder to check :P

OBS-URL: https://build.opensuse.org/request/show/158743
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/nautilus?expand=0&rev=185
This commit is contained in:
Dominique Leuenberger 2013-03-13 22:40:24 +00:00 committed by Git OBS Bridge
parent 0ae49184af
commit b2c18171bf
6 changed files with 119 additions and 413 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nautilus-3.6.3.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d272027754ce8591959ae854fc6b5f43eee4af31e4eecf06de727acebe0ee46c
size 4959376

3
nautilus-3.7.91.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a51e0dec4c72c93817243f01bdeea46f115ffe0b67059f05071df8e237987e5a
size 4972544

275
nautilus-make-sure-to-always-notify-when-unmounting.patch
View File

@ -1,275 +0,0 @@
From 463e8d1b1922474e4cf591a3029ea813804bd3e7 Mon Sep 17 00:00:00 2001
From: Cosimo Cecchi <cosimoc@gnome.org>
Date: Tue, 11 Dec 2012 16:25:45 +0000
Subject: places-sidebar: make sure to always notify when unmounting
When unmounting from the sidebar with an operation other than eject, we
still need to set up the progress notification, as some drives return
FALSE for can_eject.
https://bugzilla.redhat.com/show_bug.cgi?id=885133
---
diff --git a/libnautilus-private/nautilus-file-operations.c b/libnautilus-private/nautilus-file-operations.c
index 85d5a6f..d955331 100644
--- a/libnautilus-private/nautilus-file-operations.c
+++ b/libnautilus-private/nautilus-file-operations.c
@@ -2028,12 +2028,26 @@ nautilus_file_operations_delete (GList *files,
typedef struct {
gboolean eject;
GMount *mount;
+ GMountOperation *mount_operation;
GtkWindow *parent_window;
NautilusUnmountCallback callback;
gpointer callback_data;
} UnmountData;
static void
+unmount_data_free (UnmountData *data)
+{
+ if (data->parent_window) {
+ g_object_remove_weak_pointer (G_OBJECT (data->parent_window),
+ (gpointer *) &data->parent_window);
+ }
+
+ g_clear_object (&data->mount_operation);
+ g_object_unref (data->mount);
+ g_free (data);
+}
+
+static void
unmount_mount_callback (GObject *source_object,
GAsyncResult *res,
gpointer user_data)
@@ -2073,14 +2087,8 @@ unmount_mount_callback (GObject *source_object,
if (error != NULL) {
g_error_free (error);
}
-
- if (data->parent_window) {
- g_object_remove_weak_pointer (G_OBJECT (data->parent_window),
- (gpointer *) &data->parent_window);
- }
- g_object_unref (data->mount);
- g_free (data);
+ unmount_data_free (data);
}
static void
@@ -2088,7 +2096,11 @@ do_unmount (UnmountData *data)
{
GMountOperation *mount_op;
- mount_op = gtk_mount_operation_new (data->parent_window);
+ if (data->mount_operation) {
+ mount_op = g_object_ref (data->mount_operation);
+ } else {
+ mount_op = gtk_mount_operation_new (data->parent_window);
+ }
if (data->eject) {
g_mount_eject_with_operation (data->mount,
0,
@@ -2260,6 +2272,7 @@ empty_trash_for_unmount_done (gboolean success,
void
nautilus_file_operations_unmount_mount_full (GtkWindow *parent_window,
GMount *mount,
+ GMountOperation *mount_operation,
gboolean eject,
gboolean check_trash,
NautilusUnmountCallback callback,
@@ -2277,6 +2290,9 @@ nautilus_file_operations_unmount_mount_full (GtkWindow *par
(gpointer *) &data->parent_window);
}
+ if (mount_operation) {
+ data->mount_operation = g_object_ref (mount_operation);
+ }
data->eject = eject;
data->mount = g_object_ref (mount);
@@ -2302,13 +2318,7 @@ nautilus_file_operations_unmount_mount_full (GtkWindow *par
callback (callback_data);
}
- if (data->parent_window) {
- g_object_remove_weak_pointer (G_OBJECT (data->parent_window),
- (gpointer *) &data->parent_window);
- }
-
- g_object_unref (data->mount);
- g_free (data);
+ unmount_data_free (data);
return;
}
}
@@ -2322,7 +2332,7 @@ nautilus_file_operations_unmount_mount (GtkWindow *parent_w
gboolean eject,
gboolean check_trash)
{
- nautilus_file_operations_unmount_mount_full (parent_window, mount, eject,
+ nautilus_file_operations_unmount_mount_full (parent_window, mount, NULL, eject,
check_trash, NULL, NULL);
}
diff --git a/libnautilus-private/nautilus-file-operations.h b/libnautilus-private/nautilus-file-operations.h
index 55f7479..e0af100 100644
--- a/libnautilus-private/nautilus-file-operations.h
+++ b/libnautilus-private/nautilus-file-operations.h
@@ -107,6 +107,7 @@ void nautilus_file_operations_unmount_mount (GtkWindow *par
gboolean check_trash);
void nautilus_file_operations_unmount_mount_full (GtkWindow *parent_window,
GMount *mount,
+ GMountOperation *mount_operation,
gboolean eject,
gboolean check_trash,
NautilusUnmountCallback callback,
diff --git a/libnautilus-private/nautilus-file.c b/libnautilus-private/nautilus-file.c
index af42102..84be583 100644
--- a/libnautilus-private/nautilus-file.c
+++ b/libnautilus-private/nautilus-file.c
@@ -1262,7 +1262,7 @@ nautilus_file_unmount (NautilusFile *file,
data->file = nautilus_file_ref (file);
data->callback = callback;
data->callback_data = callback_data;
- nautilus_file_operations_unmount_mount_full (NULL, file->details->mount, FALSE, TRUE, unmount_done, data);
+ nautilus_file_operations_unmount_mount_full (NULL, file->details->mount, NULL, FALSE, TRUE, unmount_done, data);
} else if (callback) {
callback (file, NULL, NULL, callback_data);
}
@@ -1296,7 +1296,7 @@ nautilus_file_eject (NautilusFile *file,
data->file = nautilus_file_ref (file);
data->callback = callback;
data->callback_data = callback_data;
- nautilus_file_operations_unmount_mount_full (NULL, file->details->mount, TRUE, TRUE, unmount_done, data);
+ nautilus_file_operations_unmount_mount_full (NULL, file->details->mount, NULL, TRUE, TRUE, unmount_done, data);
} else if (callback) {
callback (file, NULL, NULL, callback_data);
}
diff --git a/src/nautilus-places-sidebar.c b/src/nautilus-places-sidebar.c
index adf07fb..224a2da 100644
--- a/src/nautilus-places-sidebar.c
+++ b/src/nautilus-places-sidebar.c
@@ -1975,13 +1975,55 @@ unmount_done (gpointer data)
}
static void
+show_unmount_progress_cb (GMountOperation *op,
+ const gchar *message,
+ gint64 time_left,
+ gint64 bytes_left,
+ gpointer user_data)
+{
+ NautilusApplication *app = NAUTILUS_APPLICATION (g_application_get_default ());
+
+ if (bytes_left == 0) {
+ nautilus_application_notify_unmount_done (app, message);
+ } else {
+ nautilus_application_notify_unmount_show (app, message);
+ }
+}
+
+static void
+show_unmount_progress_aborted_cb (GMountOperation *op,
+ gpointer user_data)
+{
+ NautilusApplication *app = NAUTILUS_APPLICATION (g_application_get_default ());
+ nautilus_application_notify_unmount_done (app, NULL);
+}
+
+static GMountOperation *
+get_unmount_operation (NautilusPlacesSidebar *sidebar)
+{
+ GMountOperation *mount_op;
+
+ mount_op = gtk_mount_operation_new (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (sidebar))));
+ g_signal_connect (mount_op, "show-unmount-progress",
+ G_CALLBACK (show_unmount_progress_cb), sidebar);
+ g_signal_connect (mount_op, "aborted",
+ G_CALLBACK (show_unmount_progress_aborted_cb), sidebar);
+
+ return mount_op;
+}
+
+static void
do_unmount (GMount *mount,
NautilusPlacesSidebar *sidebar)
{
+ GMountOperation *mount_op;
+
if (mount != NULL) {
- nautilus_file_operations_unmount_mount_full (NULL, mount, FALSE, TRUE,
+ mount_op = get_unmount_operation (sidebar);
+ nautilus_file_operations_unmount_mount_full (NULL, mount, mount_op, FALSE, TRUE,
unmount_done,
g_object_ref (sidebar->window));
+ g_object_unref (mount_op);
}
}
@@ -2013,30 +2055,6 @@ unmount_shortcut_cb (GtkMenuItem *item,
}
static void
-show_unmount_progress_cb (GMountOperation *op,
- const gchar *message,
- gint64 time_left,
- gint64 bytes_left,
- gpointer user_data)
-{
- NautilusApplication *app = NAUTILUS_APPLICATION (g_application_get_default ());
-
- if (bytes_left == 0) {
- nautilus_application_notify_unmount_done (app, message);
- } else {
- nautilus_application_notify_unmount_show (app, message);
- }
-}
-
-static void
-show_unmount_progress_aborted_cb (GMountOperation *op,
- gpointer user_data)
-{
- NautilusApplication *app = NAUTILUS_APPLICATION (g_application_get_default ());
- nautilus_application_notify_unmount_done (app, NULL);
-}
-
-static void
drive_eject_cb (GObject *source_object,
GAsyncResult *res,
gpointer user_data)
@@ -2126,9 +2144,8 @@ do_eject (GMount *mount,
GDrive *drive,
NautilusPlacesSidebar *sidebar)
{
- GMountOperation *mount_op;
+ GMountOperation *mount_op = get_unmount_operation (sidebar);
- mount_op = gtk_mount_operation_new (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (sidebar))));
if (mount != NULL) {
g_mount_eject_with_operation (mount, 0, mount_op, NULL, mount_eject_cb,
g_object_ref (sidebar->window));
@@ -2140,10 +2157,6 @@ do_eject (GMount *mount,
g_object_ref (sidebar->window));
}
- g_signal_connect (mount_op, "show-unmount-progress",
- G_CALLBACK (show_unmount_progress_cb), sidebar);
- g_signal_connect (mount_op, "aborted",
- G_CALLBACK (show_unmount_progress_aborted_cb), sidebar);
g_object_unref (mount_op);
}
@@ -2381,9 +2394,7 @@ stop_shortcut_cb (GtkMenuItem *item,
-1);
if (drive != NULL) {
- GMountOperation *mount_op;
-
- mount_op = gtk_mount_operation_new (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (sidebar))));
+ GMountOperation *mount_op = get_unmount_operation (sidebar);
g_drive_stop (drive, G_MOUNT_UNMOUNT_NONE, mount_op, NULL, drive_stop_cb,
g_object_ref (sidebar->window));
g_object_unref (mount_op);
--
cgit v0.9.0.2

123
nautilus-stray-empty-document.patch
View File

@ -1,123 +0,0 @@
From a0b78f40099e5861a1d6e40b4e2295241bf9a224 Mon Sep 17 00:00:00 2001
From: Cosimo Cecchi <cosimoc@gnome.org>
Date: Mon, 5 Nov 2012 16:36:10 -0500
Subject: [PATCH] view: don't show stray Empty Document entry in New Document
menu
This now reflects files in the templates directory - no point in adding
yet another "stock" entry with this model.
https://bugzilla.gnome.org/show_bug.cgi?id=687139
---
src/nautilus-actions.h | 1 -
src/nautilus-directory-view-ui.xml | 4 ----
src/nautilus-view.c | 38 --------------------------------------
3 files changed, 43 deletions(-)
diff --git a/src/nautilus-actions.h b/src/nautilus-actions.h
index 012589c..0132454 100644
--- a/src/nautilus-actions.h
+++ b/src/nautilus-actions.h
@@ -118,7 +118,6 @@
#define NAUTILUS_ACTION_SCRIPTS "Scripts"
#define NAUTILUS_ACTION_OPEN_SCRIPTS_FOLDER "Open Scripts Folder"
#define NAUTILUS_ACTION_NEW_DOCUMENTS "New Documents"
-#define NAUTILUS_ACTION_NEW_EMPTY_DOCUMENT "New Empty Document"
#define NAUTILUS_ACTION_EMPTY_TRASH_CONDITIONAL "Empty Trash Conditional"
#define NAUTILUS_ACTION_MANUAL_LAYOUT "Manual Layout"
#define NAUTILUS_ACTION_REVERSED_ORDER "Reversed Order"
diff --git a/src/nautilus-directory-view-ui.xml b/src/nautilus-directory-view-ui.xml
index 9950137..efdb9d1 100644
--- a/src/nautilus-directory-view-ui.xml
+++ b/src/nautilus-directory-view-ui.xml
@@ -16,8 +16,6 @@
<menuitem name="New Folder with Selection" action="New Folder with Selection"/>
<menu action="New Documents">
<placeholder name="New Documents Placeholder"/>
- <separator name="After New Documents"/>
- <menuitem name="New Empty Document" action="New Empty Document"/>
</menu>
</placeholder>
<placeholder name="Global File Items Placeholder">
@@ -44,8 +42,6 @@
<menuitem name="New Folder" action="New Folder"/>
<menu action="New Documents">
<placeholder name="New Documents Placeholder"/>
- <separator name="After New Documents"/>
- <menuitem name="New Empty Document" action="New Empty Document"/>
</menu>
</placeholder>
<separator name="Clipboard separator"/>
diff --git a/src/nautilus-view.c b/src/nautilus-view.c
index f01442a..76f2f66 100644
--- a/src/nautilus-view.c
+++ b/src/nautilus-view.c
@@ -2099,15 +2099,6 @@ action_new_folder_with_selection_callback (GtkAction *action,
}
static void
-action_new_empty_file_callback (GtkAction *action,
- gpointer callback_data)
-{
- g_assert (NAUTILUS_IS_VIEW (callback_data));
-
- nautilus_view_new_file (NAUTILUS_VIEW (callback_data), NULL, NULL);
-}
-
-static void
action_properties_callback (GtkAction *action,
gpointer callback_data)
{
@@ -7145,11 +7136,6 @@ static const GtkActionEntry directory_view_entries[] = {
/* label, accelerator */ N_("New Folder with Selection"), NULL,
/* tooltip */ N_("Create a new folder containing the selected items"),
G_CALLBACK (action_new_folder_with_selection_callback) },
- /* name, stock id */ { NAUTILUS_ACTION_NEW_EMPTY_DOCUMENT, NULL,
- /* translators: this is used to indicate that a document doesn't contain anything */
- /* label, accelerator */ N_("_Empty Document"), NULL,
- /* tooltip */ N_("Create a new empty document inside this folder"),
- G_CALLBACK (action_new_empty_file_callback) },
/* name, stock id */ { NAUTILUS_ACTION_OPEN, NULL,
/* label, accelerator */ N_("_Open"), "<control>o",
/* tooltip */ N_("Open the selected item in this window"),
@@ -7402,27 +7388,6 @@ static const GtkToggleActionEntry directory_view_toggle_entries[] = {
};
static void
-connect_proxy (NautilusView *view,
- GtkAction *action,
- GtkWidget *proxy,
- GtkActionGroup *action_group)
-{
- GdkPixbuf *pixbuf;
- GtkWidget *image;
-
- if (strcmp (gtk_action_get_name (action), NAUTILUS_ACTION_NEW_EMPTY_DOCUMENT) == 0 &&
- GTK_IS_IMAGE_MENU_ITEM (proxy)) {
- pixbuf = nautilus_ui_get_menu_icon ("text-x-generic");
- if (pixbuf != NULL) {
- image = gtk_image_new_from_pixbuf (pixbuf);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (proxy), image);
-
- g_object_unref (pixbuf);
- }
- }
-}
-
-static void
pre_activate (NautilusView *view,
GtkAction *action,
GtkActionGroup *action_group)
@@ -7485,9 +7450,6 @@ real_merge_menus (NautilusView *view)
g_object_unref (action);
g_free (tooltip);
- g_signal_connect_object (action_group, "connect-proxy",
- G_CALLBACK (connect_proxy), G_OBJECT (view),
- G_CONNECT_SWAPPED);
g_signal_connect_object (action_group, "pre-activate",
G_CALLBACK (pre_activate), G_OBJECT (view),
G_CONNECT_SWAPPED);
--
1.8.0.1

111
nautilus.changes
View File

@ -1,3 +1,114 @@
-------------------------------------------------------------------
Tue Mar 5 09:46:15 UTC 2013 - dimstar@opensuse.org
- Update to version 3.7.91:
+ Export an OpenLocations property over DBus.
+ Add a way to reuse and raise existing windows already opened to
a given location.
+ Use an ARGB window for the desktop.
+ Stop drawing the desktop background.
+ Register our GtkApplication with gnome-session.
+ Fix Tracker search not working correctly.
+ Fix activation of search provider results.
+ Fix nautilus --quit from terminal not working.
-------------------------------------------------------------------
Mon Feb 18 20:43:13 UTC 2013 - dimstar@opensuse.org
- Update to version 3.7.90:
+ Add back a Treeview option for list view. This is off by
default, and is backed by a checkbox in the Preferences dialog.
+ Add a "Connect to Server" item in the Network section of the
sidebar.
+ Add a "Format..." item in volume context menus in the sidebar.
+ Fix accelerators not showing up in gear and view menus.
+ Use G_APP_INFO_CREATE_NEEDS_TERMINAL instead of handrolled
code.
-------------------------------------------------------------------
Thu Feb 14 23:49:07 UTC 2013 - dimstar@opensuse.org
- Update to version 3.7.5:
+ Switch to hovered locations on DnD.
+ Support a --force-desktop commandline option for classic mode.
+ Add a separate desktop file for classic mode integration.
+ Use a better position for navigation button popup menus.
+ Fix many memory leaks.
+ Fix a crasher when a file in trash has reserved characters in
the filename.
+ Fix a crasher when closing the sidebar immediately after
construction.
+ Fix a crasher closing the properties dialog while calculating
folder size.
+ Fix backup files showing up in search provider results.
+ Fix floating bar buttons being added twice.
-------------------------------------------------------------------
Thu Feb 14 22:49:07 UTC 2013 - dimstar@opensuse.org
- Update to version 3.7.4:
+ Support a --select commandline option to force selection of the
passed-in URI.
+ Add source hints to notifications.
+ Modernize build infrastructure.
+ Use public GTK-a11y support instead of our own hacks.
+ Fix a crasher in the Shell search provider.
- Replace pkgconfig(tracker-sparql-0.14) BuildRequires with
pkgconfig(tracker-sparql-0.16), following upstream.
-------------------------------------------------------------------
Thu Feb 14 21:49:07 UTC 2013 - dimstar@opensuse.org
- Update to version 3.7.3:
+ Update search provider to org.gnome.Shell.SearchProvider2
interface.
+ Rely on GIO to parse ".hidden" files.
+ Consistently use unicode ellipsis instead of three periods.
+ Use a different label for removing a file from "Recent".
+ Restore the previous behavior wrt. framing for custom icons.
+ Share the "show hidden" GSetting option with the GTK+
file chooser.
+ Fix missing unmount sync notification under some circumstances.
+ Fix infinite loop while deep counting the size of "/".
+ Fix wrong filename when restoring file from trash.
- Drop nautilus-make-sure-to-always-notify-when-unmounting.patch:
fixed upstream.
-------------------------------------------------------------------
Thu Feb 14 20:49:07 UTC 2013 - dimstar@opensuse.org
- Update to version 3.7.2:
+ Request to render larger thumbnails by default.
+ Don't quote the current location name in search bar.
+ Use "Run" in menus when launchine executables.
+ Fix stray Empty Document item in New Document menu.
- Drop nautilus-stray-empty-document.patch: fixed upstream.
-------------------------------------------------------------------
Thu Feb 14 19:49:07 UTC 2013 - dimstar@opensuse.org
- Update to version 3.7.1:
+ Turn on again recursive search for the simple engine.
+ Enable incremental loading for search directories.
+ Add extra information to image properties page.
+ Show free space pie chart for the local root filesystem.
+ Resolve symbolic links before launching a file.
+ Avoid sync I/O when reading bookmark locations.
+ Don't add non-existent XDG folders to the sidebar.
+ Don't offer to remove built-in XDG folder bookmarks.
+ Fix black input field when renaming a file in icon view with
XIM enabled.
+ Fix wrong return location when unmounting a remote mount.
+ Fix notebook tabs not properly switching after timeout when
hovered.
+ Fix search toggle button state inconsistent when switching
between tabs.
+ Fix crasher when using the Tracker engine from the Shell search
provider.
+ Fix crasher in Shell search provider.
+ Fix crasher when unmounting a volume under certain.
circumstances.
-------------------------------------------------------------------
Thu Feb 14 18:49:07 UTC 2013 - mike.catanzaro@gmail.com

17
nautilus.spec
View File

@ -17,12 +17,12 @@
Name: nautilus
Version: 3.6.3
Version: 3.7.91
Release: 0
Summary: File Manager for the GNOME Desktop
License: GPL-2.0+
Group: Productivity/File utilities
Source: http://download.gnome.org/sources/nautilus/3.6/%{name}-%{version}.tar.xz
Source: http://download.gnome.org/sources/nautilus/3.7/%{name}-%{version}.tar.xz
# fate#308344 bgo#602147
Source1: mount-archive.desktop
Source99: baselibs.conf
@ -30,10 +30,6 @@ Url: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# PATCH-NEEDS-REBASE nautilus-drives-and-volumes-on-desktop.diff bnc335411 federico@novell.com
Patch15: nautilus-drives-and-volumes-on-desktop.diff
# PATCH-FIX-UPSTREAM nautilus-make-sure-to-always-notify-when-unmounting.patch rh#885133 zaitor@opensuse.org -- fixes notifications when umounting drives.
Patch16: nautilus-make-sure-to-always-notify-when-unmounting.patch
# PATCH-FIX-UPSTREAM nautilus-stray-empty-document.patch bnc#803649 bgo#687139 mike.catanzaro@gmail.com -- don't show extra Empty Document entry in the Templates menu
Patch17: nautilus-stray-empty-document.patch
# needed for directory ownership
BuildRequires: dbus-1
BuildRequires: fdupes
@ -49,14 +45,14 @@ BuildRequires: translation-update-upstream
BuildRequires: update-desktop-files
BuildRequires: pkgconfig(exempi-2.0)
BuildRequires: pkgconfig(gail-3.0)
BuildRequires: pkgconfig(glib-2.0) >= 2.31.9
BuildRequires: pkgconfig(glib-2.0) >= 2.35.1
BuildRequires: pkgconfig(gnome-desktop-3.0)
BuildRequires: pkgconfig(gtk+-3.0) >= 3.5.12
BuildRequires: pkgconfig(gtk+-3.0) >= 3.7.7
BuildRequires: pkgconfig(libexif)
BuildRequires: pkgconfig(libnotify)
BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(pango)
BuildRequires: pkgconfig(tracker-sparql-0.14)
BuildRequires: pkgconfig(tracker-sparql-0.16)
# So that symlinks to icons work:
Requires: gnome-icon-theme
Recommends: %{name}-lang
@ -120,8 +116,6 @@ translation-update-upstream
#gnome-patch-translation-prepare
### %patch15 -p1
#gnome-patch-translation-update
%patch16 -p1
%patch17 -p1
%build
%configure\
@ -196,7 +190,6 @@ rm -rf $RPM_BUILD_ROOT
%dir %{_datadir}/gnome-shell
%dir %{_datadir}/gnome-shell/search-providers
%{_datadir}/gnome-shell/search-providers/nautilus-search-provider.ini
%{_libexecdir}/nautilus-shell-search-provider
%files lang -f %{name}.lang