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

Accepting request 68331 from home:vuntz:branches:GNOME:Factory

Browse Source 
ok

OBS-URL: https://build.opensuse.org/request/show/68331
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/nautilus?expand=0&rev=127
This commit is contained in:
Vincent Untz 2011-04-25 18:32:58 +00:00 committed by Git OBS Bridge
parent 7ac84d6c7c
commit 13969ca0db
3 changed files with 37 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

113
nautilus-boot-order.patch
View File

@ -1,113 +0,0 @@
Index: nautilus-2.30.1/cut-n-paste-code/libegg/eggsmclient-xsmp.c
===================================================================
--- nautilus-2.30.1.orig/cut-n-paste-code/libegg/eggsmclient-xsmp.c
+++ nautilus-2.30.1/cut-n-paste-code/libegg/eggsmclient-xsmp.c
@@ -317,6 +317,9 @@ sm_client_xsmp_startup (EggSMClient *cli
char *ret_client_id;
char error_string_ret[256];
+ if (xsmp->connection)
+ return;
+
xsmp->client_id = g_strdup (client_id);
ice_init ();
Index: nautilus-2.30.1/cut-n-paste-code/libegg/eggsmclient.c
===================================================================
--- nautilus-2.30.1.orig/cut-n-paste-code/libegg/eggsmclient.c
+++ nautilus-2.30.1/cut-n-paste-code/libegg/eggsmclient.c
@@ -175,6 +175,7 @@ egg_sm_client_class_init (EggSMClientCla
0);
}
+static gboolean sm_client_connect = FALSE;
static gboolean sm_client_disable = FALSE;
static char *sm_client_state_file = NULL;
static char *sm_client_id = NULL;
@@ -202,8 +203,10 @@ sm_client_post_parse_func (GOptionContex
* use the same client id. */
g_unsetenv ("DESKTOP_AUTOSTART_ID");
- if (EGG_SM_CLIENT_GET_CLASS (client)->startup)
- EGG_SM_CLIENT_GET_CLASS (client)->startup (client, sm_client_id);
+ if (sm_client_connect) {
+ if (EGG_SM_CLIENT_GET_CLASS (client)->startup)
+ EGG_SM_CLIENT_GET_CLASS (client)->startup (client, sm_client_id);
+ }
return TRUE;
}
@@ -240,6 +243,14 @@ egg_sm_client_get_option_group (void)
{ "sm-config-prefix", 0, G_OPTION_FLAG_HIDDEN,
G_OPTION_ARG_STRING, &sm_config_prefix,
NULL, NULL },
+ /* Normally the client is connected to the session manager
+ * automatically, when calling 'egg_sm_client_get_option_group'.
+ * One can disable this automatic connect by calling this function.
+ * Using this function should definitely be an exception.
+ */
+ { "sm-connect", 0, 0,
+ G_OPTION_ARG_NONE, &sm_client_connect,
+ NULL, NULL },
{ NULL }
};
GOptionGroup *group;
@@ -472,6 +483,15 @@ egg_sm_client_will_quit (EggSMClient *cl
EGG_SM_CLIENT_GET_CLASS (client)->will_quit (client, will_quit);
}
+void
+egg_sm_client_startup (EggSMClient *client)
+{
+ g_return_if_fail (EGG_IS_SM_CLIENT (client));
+
+ if (EGG_SM_CLIENT_GET_CLASS (client)->startup)
+ EGG_SM_CLIENT_GET_CLASS (client)->startup (client, sm_client_id);
+}
+
/**
* egg_sm_client_end_session:
* @style: a hint at how to end the session
Index: nautilus-2.30.1/cut-n-paste-code/libegg/eggsmclient.h
===================================================================
--- nautilus-2.30.1.orig/cut-n-paste-code/libegg/eggsmclient.h
+++ nautilus-2.30.1/cut-n-paste-code/libegg/eggsmclient.h
@@ -106,6 +106,8 @@ void egg_sm_client_set_resta
/* Handling "quit_requested" signal */
void egg_sm_client_will_quit (EggSMClient *client,
gboolean will_quit);
+/* startup the client (connect to sm) */
+void egg_sm_client_startup (EggSMClient *client);
/* Initiate a logout/reboot/shutdown */
gboolean egg_sm_client_end_session (EggSMClientEndStyle style,
Index: nautilus-2.30.1/src/nautilus-main.c
===================================================================
--- nautilus-2.30.1.orig/src/nautilus-main.c
+++ nautilus-2.30.1/src/nautilus-main.c
@@ -315,6 +315,13 @@ setup_debug_log (void)
setup_debug_log_glog ();
}
+static gboolean
+startup_done_cb (EggSMClient *client)
+{
+ egg_sm_client_startup (client);
+ return FALSE;
+}
+
int
main (int argc, char *argv[])
{
@@ -541,6 +548,11 @@ main (int argc, char *argv[])
}
if (is_event_loop_needed ()) {
+ /* Register with the session manager when we're done bringing up the
+ * desktop. This means we don't have to compete for resources with the
+ * application startup phase, so the desktop comes up sooner. */
+ g_idle_add_full (G_PRIORITY_LOW, (GSourceFunc) startup_done_cb, application->smclient, NULL);
+
gtk_main ();
}
}

27
nautilus.changes
View File

@ -92,7 +92,7 @@ Tue Dec 28 19:52:28 CET 2010 - dimstar@opensuse.org
+ Large refactor of NautilusWindow/NautilusView architecture
+ Cleanup installed desktop files
+ Fix a couple of crashers
+ Build with GCC 4.6
+ Build with GCC 4.6
- Changes from version 2.91.7:
+ Adapt to GTK+ 2.99.0 deprecations
+ Fix a crasher in the pathbar
@ -160,13 +160,24 @@ Tue Dec 28 19:52:28 CET 2010 - dimstar@opensuse.org
+ Cleanup of libeel's obsolete code
+ Always show free space in the status string
+ Disable icon scaling outside the desktop
+ Various minor UI fixes
- Remove nautilus-bnc117333-....diff:
fixed upstream
- Remove nautilus-boot-order.patch: no longer needed
- Disable nautilus-bnc363122-lockdown-context-menus.diff:
need rebase
- Disable nautilus-bgo350950-search-desktop.diff: need rebase
+ Various minor UI fixes
- Remove nautilus-bnc117333-bgo350962-folder-icon-for-menus-and-windows.diff:
fixed upstream.
- Remove nautilus-boot-order.patch: no longer needed as session
support was dropped.
- Disable nautilus-bnc363122-lockdown-context-menus.diff:
need rebase.
- Disable nautilus-bgo350950-search-desktop.diff: need rebase.
- Remove use_tracker macro as beagle support was dropped.
- Replace GConf2 schemas handling with GSettings schemas handling,
with %glib2_gsettings_schema_* macros.
- Add pkgconfig(libnotify) BuildRequires.
- Remove pkgconfig() BuildRequires: gconf-2.0, unique-1.0.
- Change pkgconfig() BuildRequires for GNOME 3 port:
+ Old ones: gail, gnome-desktop-2.0, gtk+-2.0.
+ New ones: gail-3.0, gnome-desktop-3.0, gtk+-3.0.
- Add dbus-1 BuildRequires for directory ownership.
-------------------------------------------------------------------
Wed Dec 8 19:51:13 CET 2010 - vuntz@opensuse.org

38
nautilus.spec
View File

@ -29,7 +29,7 @@ Source1: mount-archive.desktop
Source99: baselibs.conf
Url: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# PATCH-FIX-UPSTREAM nautilus-bgo350950-search-desktop.diff bgo350950 federico@novell.com -- add a desktop file for Nautilus search interface
# PATCH-NEEDS-REBASE PATCH-FIX-UPSTREAM nautilus-bgo350950-search-desktop.diff bgo350950 federico@novell.com -- add a desktop file for Nautilus search interface
Patch4: nautilus-bgo350950-search-desktop.diff
# PATCH-NEEDS-REBASE nautilus-146947-rename-bad-parameters-message.diff bgo350976 bnc146947 federico@novell.com -- The upstream bug is still open, so we need to check if it's still needed (you just need a samba share to test). If yes, we should port the patch to gio
Patch9: nautilus-146947-rename-bad-parameters-message.diff
@ -39,8 +39,8 @@ Patch15: nautilus-drives-and-volumes-on-desktop.diff
Patch20: nautilus-bnc363122-lockdown-context-menus.diff
# PATCH-NEEDS-REBASE nautilus-sysadmin-desktop-items.diff fate305252 federico@novell.com -- Support sysadmin-defined desktop items (was PATCH-FEATURE-OPENSUSE)
Patch21: nautilus-sysadmin-desktop-items.diff
# PATCH-FIX-UPSTREAM nautilus-boot-order.patch bgo#619841 sshaw@decriptor.com -- From SLED w/o sreadahead. Delays applets
Patch22: nautilus-boot-order.patch
# needed for directory ownership
BuildRequires: dbus-1
BuildRequires: fdupes
BuildRequires: gnome-common
BuildRequires: gnome-icon-theme
@ -48,20 +48,20 @@ BuildRequires: gnome-patch-translation
BuildRequires: gobject-introspection-devel
BuildRequires: gtk-doc
BuildRequires: intltool
BuildRequires: libexif-devel
BuildRequires: libexempi-devel
BuildRequires: libselinux-devel
BuildRequires: libxml2-devel
BuildRequires: pkgconfig(gnome-desktop-3.0)
BuildRequires: pkgconfig(gtk+-3.0)
BuildRequires: pkgconfig(gail-3.0)
BuildRequires: pkgconfig(libnotify)
BuildRequires: translation-update-upstream
BuildRequires: update-desktop-files
# needed for directory ownership
BuildRequires: dbus-1
BuildRequires: pkgconfig(gail-3.0)
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(gnome-desktop-3.0)
BuildRequires: pkgconfig(gtk+-3.0)
BuildRequires: pkgconfig(libexif)
BuildRequires: pkgconfig(libnotify)
BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(pango)
# So that symlinks to icons work:
Requires: gnome-desktop gnome-icon-theme
Requires: gnome-icon-theme
Recommends: %{name}-lang
Recommends: gvfs
Provides: nautilus2 = %{version}
@ -158,30 +158,30 @@ rm -rf $RPM_BUILD_ROOT
%postun -n libnautilus-extension1 -p /sbin/ldconfig
%files
%files
%defattr(-,root,root)
%doc AUTHORS COPYING COPYING-DOCS ChangeLog MAINTAINERS NEWS README THANKS TODO
%{_bindir}/*
%{_datadir}/glib-2.0/schemas/*.xml
%{_datadir}/GConf/gsettings/*.convert
%{_datadir}/applications/*.desktop
%{_datadir}/dbus-1/services/org.gnome.Nautilus.service
%{_datadir}/glib-2.0/schemas/*.xml
%{_datadir}/icons/hicolor/*/*/*.*
%{_datadir}/mime/packages/*.xml
%{_datadir}/nautilus
%{_datadir}/pixmaps/nautilus
%{_datadir}/pixmaps/*.png
%{_datadir}/icons/hicolor/*/*/*.*
%{_datadir}/dbus-1/services/org.gnome.Nautilus.service
%dir %{_libdir}/nautilus
%{_libdir}/girepository-1.0/Nautilus-3.0.typelib
%{_libexecdir}/nautilus-convert-metadata
%doc %{_mandir}/man1/nautilus*.1.gz
%files -n libnautilus-extension1
%defattr(-,root,root)
%{_libdir}/libnautilus-extension.so.1*
%{_libdir}/girepository-1.0/Nautilus-3.0.typelib
%dir %{_libdir}/nautilus
%dir %{_libdir}/nautilus/extensions-3.0
%{_libdir}/nautilus/extensions-3.0/*.so
%{_libdir}/libnautilus-extension.so.1*
%files lang -f %{name}.lang
@ -196,6 +196,4 @@ rm -rf $RPM_BUILD_ROOT
%dir %{_datadir}/gtk-doc/html
%{_datadir}/gtk-doc/html/*
%changelog