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

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/nautilus?expand=0&rev=5

Browse Source
This commit is contained in:
OBS User unknown 2007-03-16 09:12:56 +00:00 committed by Git OBS Bridge
parent 2609c0cbb1
commit 7dc88d7989
8 changed files with 44 additions and 1793 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
nautilus-181941-i18n.patch
View File

@ -1,11 +1,12 @@
diff -ur nautilus-2.16.1/src/nautilus-property-browser.c nautilus-2.16.1.fixed/src/nautilus-property-browser.c
--- nautilus-2.16.1/src/nautilus-property-browser.c 2006-06-16 11:04:09.000000000 -0400
+++ nautilus-2.16.1.fixed/src/nautilus-property-browser.c 2007-01-08 11:58:42.000000000 -0500
@@ -1829,7 +1829,7 @@
Index: nautilus-2.17.91/src/nautilus-property-browser.c
===================================================================
--- nautilus-2.17.91.orig/src/nautilus-property-browser.c
+++ nautilus-2.17.91/src/nautilus-property-browser.c
@@ -1865,7 +1865,7 @@ add_reset_property (NautilusPropertyBrow
g_free (reset_image_file_name);
- reset_image = labeled_image_new ("Reset", reset_chit, RESET_IMAGE_NAME, PANGO_SCALE_MEDIUM);
- reset_image = labeled_image_new (_("Reset"), reset_chit != NULL ? reset_chit : reset_pixbuf, RESET_IMAGE_NAME, PANGO_SCALE_MEDIUM);
+ reset_image = labeled_image_new (_("Reset"), reset_chit, RESET_IMAGE_NAME, PANGO_SCALE_MEDIUM);
gtk_container_add (GTK_CONTAINER (property_browser->details->content_table), reset_image);
eel_wrap_table_reorder_child (EEL_WRAP_TABLE (property_browser->details->content_table),

3
nautilus-2.16.1.tar.bz2
View File

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

3
nautilus-2.17.91.tar.bz2 Normal file
View File

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

180
nautilus-206369-desktop-icon-overlap.diff
View File

@ -1,180 +0,0 @@
2006-10-31 Federico Mena Quintero <federico@novell.com>
http://bugzilla.gnome.org/show_bug.cgi?id=330298
Fix the use of lazy positioning, and the saving of metadata for
lazily-positioned icons. Fixes
https://bugzilla.novell.com/show_bug.cgi?id=155337 and
https://bugzilla.novell.com/show_bug.cgi?id=174766.
* src/file-manager/fm-icon-view.c (file_has_lazy_position): Only
desktop icon files (not "real" files) have lazy positions. Don't
consider whether the directory is loading; this is not the right
place to check that.
(fm_icon_view_begin_loading): Tell the icon container that we
just started reloading.
(fm_icon_view_end_loading): Tell the icon container that we
finished loading.
* libnautilus-private/nautilus-icon-private.h
(NautilusIconContainerDetails): New flag "is_reloading".
* libnautilus-private/nautilus-icon-container.h: New prototype for
nautilus_icon_container_set_is_reloading().
* libnautilus-private/nautilus-icon-container.c
(nautilus_icon_container_set_is_reloading): New function; sets an
is_reloading flag in the icon container.
(icon_set_position): Clear icon->has_lazy_position, since the icon
will be well-positioned once this function exits.
(finish_adding_new_icons): Do not ignore already-placed lazy
position icons when filling the placement grid! Save the value of
icon->has_lazy_position before calling assign_icon_position().
Since that function may call icon_set_position() (which will clear
the flag), we need to keep the original value of the flag.
(finish_adding_new_icons): Don't clear icon->has_lazy_position
here; let icon_set_position() do it.
(finish_adding_new_icons): Emit the icon_position_changed signal
so that the parent knows that we moved an icon under it. This has
the effect of updating/preserving the position metadata for
has_lazy_position icons.
--- nautilus/src/file-manager/fm-icon-view.c~ 2006-08-29 03:04:42.000000000 -0500
+++ nautilus/src/file-manager/fm-icon-view.c 2006-10-31 17:46:27.000000000 -0600
@@ -512,22 +512,12 @@ static gboolean
file_has_lazy_position (FMDirectoryView *view,
NautilusFile *file)
{
- gboolean lazy_position;
-
/* For volumes (i.e. cdrom icon) we use lazy positioning so that when
* an old cdrom gets re-mounted in a place that now has another
- * icon we don't overlap that one. We don't do this in general though,
- * as it can cause icons moving around.
+ * icon we don't overlap that one.
*/
- lazy_position = nautilus_file_has_volume (file);
- if (lazy_position && fm_directory_view_get_loading (view)) {
- /* if volumes are loaded during directory load, don't mark them
- * as lazy. This is wrong for files that were mounted during user
- * log-off, but it is right for files that were mounted during login. */
- lazy_position = FALSE;
- }
- return lazy_position;
+ return NAUTILUS_IS_DESKTOP_ICON_FILE (file);
}
static void
@@ -1073,6 +1063,8 @@ fm_icon_view_begin_loading (FMDirectoryV
file = fm_directory_view_get_directory_as_file (view);
icon_container = GTK_WIDGET (get_icon_container (icon_view));
+ nautilus_icon_container_set_is_reloading (NAUTILUS_ICON_CONTAINER (icon_container), TRUE);
+
nautilus_icon_container_set_allow_moves (NAUTILUS_ICON_CONTAINER (icon_container),
fm_directory_view_get_allow_moves (view));
@@ -1147,6 +1139,7 @@ fm_icon_view_end_loading (FMDirectoryVie
FMIconView *icon_view;
icon_view = FM_ICON_VIEW (view);
+ nautilus_icon_container_set_is_reloading (get_icon_container (icon_view), FALSE);
}
static NautilusZoomLevel
--- nautilus-2.15.4/libnautilus-private/nautilus-icon-container.h
+++ nautilus-2.15.4/libnautilus-private/nautilus-icon-container.h
@@ -228,6 +228,8 @@
NautilusIconData *data);
/* control the layout */
+void nautilus_icon_container_set_is_reloading (NautilusIconContainer *container,
+ gboolean is_reloading);
gboolean nautilus_icon_container_is_auto_layout (NautilusIconContainer *container);
void nautilus_icon_container_set_auto_layout (NautilusIconContainer *container,
gboolean auto_layout);
--- nautilus/libnautilus-private/nautilus-icon-container.c.orig 2006-10-31 17:58:43.000000000 -0600
+++ nautilus/libnautilus-private/nautilus-icon-container.c 2006-10-31 18:00:47.000000000 -0600
@@ -288,6 +288,8 @@ icon_set_position (NautilusIcon *icon,
int x1, y1, x2, y2;
int container_x, container_y, container_width, container_height;
+ icon->has_lazy_position = FALSE;
+
if (icon->x == x && icon->y == y) {
return;
}
@@ -348,7 +350,7 @@ icon_set_position (NautilusIcon *icon,
if (icon->y == ICON_UNPOSITIONED_VALUE) {
icon->y = 0;
}
-
+
eel_canvas_item_move (EEL_CANVAS_ITEM (icon->item),
x - icon->x,
y - icon->y);
@@ -5708,9 +5710,13 @@ finish_adding_new_icons (NautilusIconCon
new_icons = g_list_reverse (new_icons);
no_position_icons = semi_position_icons = NULL;
for (p = new_icons; p != NULL; p = p->next) {
+ gboolean has_lazy_position;
+
icon = p->data;
+ has_lazy_position = icon->has_lazy_position;
+
if (assign_icon_position (container, icon)) {
- if (!container->details->auto_layout && icon->has_lazy_position) {
+ if (!container->details->is_reloading && !container->details->auto_layout && has_lazy_position) {
semi_position_icons = g_list_prepend (semi_position_icons, icon);
}
} else {
@@ -5743,6 +5749,7 @@ finish_adding_new_icons (NautilusIconCon
for (p = semi_position_icons; p != NULL; p = p->next) {
NautilusIcon *icon;
int x, y;
+ NautilusIconPosition position;
icon = p->data;
x = icon->x;
@@ -5755,9 +5762,10 @@ finish_adding_new_icons (NautilusIconCon
placement_grid_mark_icon (grid, icon);
- /* ensure that next time we run this code, the formerly semi-positioned
- * icons are treated as being positioned. */
- icon->has_lazy_position = FALSE;
+ position.x = icon->x;
+ position.y = icon->y;
+ g_signal_emit (container, signals[ICON_POSITION_CHANGED], 0,
+ icon->data, &position);
}
placement_grid_free (grid);
@@ -6657,6 +6665,15 @@ nautilus_icon_container_sort (NautilusIc
}
}
+void
+nautilus_icon_container_set_is_reloading (NautilusIconContainer *container,
+ gboolean is_reloading)
+{
+ g_return_if_fail (NAUTILUS_IS_ICON_CONTAINER (container));
+
+ container->details->is_reloading = is_reloading;
+}
+
gboolean
nautilus_icon_container_is_auto_layout (NautilusIconContainer *container)
{
--- nautilus-2.15.4/libnautilus-private/nautilus-icon-private.h
+++ nautilus-2.15.4/libnautilus-private/nautilus-icon-private.h
@@ -253,6 +253,8 @@
guint a11y_item_action_idle_handler;
GQueue* a11y_item_action_queue;
+ eel_boolean_bit is_reloading : 1;
+
/* interactive search */
gboolean disable_popdown;
gboolean imcontext_changed;

1592
nautilus-debug-log.diff
View File

File diff suppressed because it is too large Load Diff

14
nautilus-disable-zoom-control-and-view-as-option-menu.patch
View File

@ -5,10 +5,10 @@
? src/.nautilus-navigation-window.c.swp
? src/nautilus-navigation-window.c.joe
Index: src/nautilus-navigation-window.c
================================================================================
--- src/nautilus-navigation-window.c
===================================================================
--- src/nautilus-navigation-window.c.orig
+++ src/nautilus-navigation-window.c
@@ -145,7 +145,9 @@
@@ -196,7 +196,9 @@ nautilus_navigation_window_init (Nautilu
GtkUIManager *ui_manager;
GtkWidget *toolbar;
GtkWidget *location_bar;
@ -18,7 +18,7 @@ Index: src/nautilus-navigation-window.c
GtkToolItem *item;
GtkWidget *hbox, *vbox, *eventbox, *extras_vbox;
@@ -246,6 +248,7 @@
@@ -305,6 +307,7 @@ nautilus_navigation_window_init (Nautilu
window->search_bar,
TRUE, TRUE, 0);
@ -26,7 +26,7 @@ Index: src/nautilus-navigation-window.c
/* Option menu for content view types; it's empty here, filled in when a uri is set.
* Pack it into vbox so it doesn't grow vertically when location bar does.
*/
@@ -258,10 +261,13 @@
@@ -317,12 +320,15 @@ nautilus_navigation_window_init (Nautilu
gtk_container_add (GTK_CONTAINER (item), view_as_menu_vbox);
gtk_toolbar_insert (GTK_TOOLBAR (location_bar),
item, -1);
@ -36,11 +36,13 @@ Index: src/nautilus-navigation-window.c
+#if 0
gtk_box_pack_end (GTK_BOX (view_as_menu_vbox), window->view_as_combo_box, TRUE, FALSE, 0);
gtk_widget_show (window->view_as_combo_box);
g_signal_connect_object (window->view_as_combo_box, "changed",
G_CALLBACK (view_as_menu_switch_views_callback), window, 0);
+#endif
/* Allocate the zoom control and place on the right next to the menu.
* It gets shown later, if the view-frame contains something zoomable.
@@ -279,13 +285,15 @@
@@ -340,13 +346,15 @@ nautilus_navigation_window_init (Nautilu
g_signal_connect_object (window->zoom_control, "zoom_to_default",
G_CALLBACK (nautilus_window_zoom_to_default),
window, G_CONNECT_SWAPPED);

11
nautilus.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Tue Mar 13 13:26:04 CST 2007 - maw@suse.de
- Update to version 2.17.91
- Bug fixes, including bugzilla.gnome.org #364466, #403255,
#138058, #340495, #357955, #403565, #357955, #362034,
#385382, #394328, #329920, #320020, #327249, #389467, #376291,
#374623, #382207, #376952, #384078, #383840, #45953, #350579,
#318373, #132326, #372550, #338353, #372471, #330298, #155337,
#174766, #122688, #321175, #349840, #356124, #351713, #348161.
-------------------------------------------------------------------
Tue Feb 27 23:06:27 CET 2007 - dmueller@suse.de

23
nautilus.spec
View File

@ -1,5 +1,5 @@
#
# spec file for package nautilus (Version 2.16.1)
# spec file for package nautilus (Version 2.17.91)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@ -14,8 +14,8 @@ Name: nautilus
BuildRequires: cdparanoia eel-devel gnome-common gnome-icon-theme gnome-patch-translation intltool libbeagle-devel libexif-devel libgnomeui-devel libidl librsvg-devel mDNSResponder-devel perl-XML-Parser update-desktop-files
License: GNU General Public License (GPL)
Group: Productivity/File utilities
Version: 2.16.1
Release: 49
Version: 2.17.91
Release: 1
Summary: The GNOME 2.x Desktop File Manager
Source: ftp://ftp.gnome.org/pub/gnome/sources/nautilus/2.16/%{name}-%{version}.tar.bz2
URL: http://www.gnome.org
@ -33,9 +33,9 @@ Patch10: nautilus-mime.patch
Patch11: nautilus-158158-ignore-foreign-desktop-files.diff
Patch12: nautilus-212649-search-bar-visibility.patch
Patch13: nautilus-6014-network-servers-in-places-sidebar.diff
Patch14: nautilus-206369-desktop-icon-overlap.diff
# Patch14: nautilus-206369-desktop-icon-overlap.diff
Patch15: nautilus-drives-and-volumes-on-desktop.diff
Patch16: nautilus-debug-log.diff
# Patch16: nautilus-debug-log.diff
Patch17: nautilus-181941-i18n.patch
Requires: gnome2-user-docs gnome-icon-theme
Provides: nautilus2
@ -82,9 +82,9 @@ gnome-patch-translation-prepare
%patch11 -p1
%patch12
%patch13 -p1
%patch14 -p1
# %patch14 -p1
%patch15 -p1
%patch16 -p0
# %patch16 -p0
%patch17 -p1
# FIXME: this code updates translation for upstreamed patches.
cd po
@ -159,6 +159,7 @@ fi
%{_datadir}/nautilus
%{_datadir}/pixmaps/nautilus
%{_datadir}/pixmaps/*.png
%{_datadir}/icons/hicolor/*/*/*.*
%{_libdir}/*.so.*
%{_libdir}/bonobo/servers/*.server
%dir %{_libdir}/nautilus
@ -172,6 +173,14 @@ fi
%{_libdir}/pkgconfig/*.pc
%changelog
* Tue Mar 13 2007 - maw@suse.de
- Update to version 2.17.91
- Bug fixes, including bugzilla.gnome.org #364466, #403255,
[#138058], #340495, #357955, #403565, #357955, #362034,
[#385382], #394328, #329920, #320020, #327249, #389467, #376291,
[#374623], #382207, #376952, #384078, #383840, #45953, #350579,
[#318373], #132326, #372550, #338353, #372471, #330298, #155337,
[#174766], #122688, #321175, #349840, #356124, #351713, #348161.
* Tue Feb 27 2007 - dmueller@suse.de
- adjust BuildRequires: libexif->libexif-devel
* Mon Feb 05 2007 - sbrabec@suse.cz