rpms/nautilus-sendto/devel nautilus-sendto-0.10-wrong-error.patch, NONE, 1.1 nautilus-sendto.spec, 1.34, 1.35
Matthias Clasen (mclasen)
fedora-extras-commits at redhat.com
Wed May 9 18:57:06 UTC 2007
Author: mclasen
Update of /cvs/extras/rpms/nautilus-sendto/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8347
Modified Files:
nautilus-sendto.spec
Added Files:
nautilus-sendto-0.10-wrong-error.patch
Log Message:
fix a problem with dbus error handling
nautilus-sendto-0.10-wrong-error.patch:
--- NEW FILE nautilus-sendto-0.10-wrong-error.patch ---
--- nautilus-sendto-0.10/src/plugins/bluetooth.c.wrong-error 2007-05-09 14:48:27.000000000 -0400
+++ nautilus-sendto-0.10/src/plugins/bluetooth.c 2007-05-09 14:51:30.000000000 -0400
@@ -70,14 +70,18 @@ init (NstPlugin *plugin)
dbus_g_proxy_call (object, "DefaultAdapter", &e,
G_TYPE_INVALID, G_TYPE_STRING, &adapter, G_TYPE_INVALID);
if (e != NULL) {
- const char *name;
- name = dbus_g_error_get_name (e);
+ if (e->domain == DBUS_GERROR &&
+ e->code == DBUS_GERROR_REMOTE_EXCEPTION) {
+ const char *name;
- /* No adapter */
- if (g_str_equal (name, "org.bluez.Error.NoSuchAdapter") != FALSE) {
- g_error_free (e);
- return FALSE;
+ name = dbus_g_error_get_name (e);
+
+ /* No adapter */
+ if (g_str_equal (name, "org.bluez.Error.NoSuchAdapter") != FALSE) {
+ g_error_free (e);
+ return FALSE;
+ }
}
g_warning ("Couldn't get default bluetooth adapter: %s",
Index: nautilus-sendto.spec
===================================================================
RCS file: /cvs/extras/rpms/nautilus-sendto/devel/nautilus-sendto.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- nautilus-sendto.spec 16 Apr 2007 22:58:58 -0000 1.34
+++ nautilus-sendto.spec 9 May 2007 18:56:31 -0000 1.35
@@ -1,6 +1,6 @@
Name: nautilus-sendto
Version: 0.10
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Nautilus context menu for sending files
Group: User Interface/Desktops
@@ -25,6 +25,7 @@
Requires(preun): GConf2
Patch1: nautilus-sendto-0.7-thunderbird.patch
+Patch2: nautilus-sendto-0.10-wrong-error.patch
# For compat with old nautilus-sendto packaging
Provides: nautilus-sendto-gaim
@@ -43,6 +44,7 @@
%setup -q
%patch1 -p1 -b .thunderbird
+%patch2 -p1 -b .wrong-error
%build
@@ -98,6 +100,9 @@
%{_datadir}/man/man1/nautilus-sendto.1.gz
%changelog
+* Wed May 9 2007 Matthias Clasen <mclasen at redhat.com> - 0.10-3
+- Fix a problem with dbus error handling (#239588)
+
* Mon Apr 16 2007 Warren Togami <wtogami at redhat.com> - 0.10-2
- disable gaim dep temporarily during transition to pidgin
More information about the fedora-extras-commits
mailing list