Compare commits

...
Sign in to create a new pull request.

3 commits

Author SHA1 Message Date
Richard Hughes
a0d7c35539 Fix compile.
Resolves: #716099
2011-07-06 12:10:10 +01:00
Fedora Release Engineering
c43eab523e dist-git conversion 2010-07-29 14:43:11 +00:00
Jesse Keating
f70452583d Initialize branch F-13 for unique 2010-02-17 03:23:25 +00:00
4 changed files with 38 additions and 22 deletions

View file

View file

@ -1,21 +0,0 @@
# Makefile for source rpm: unique
# $Id: Makefile,v 1.1 2008/05/16 15:44:28 kevin Exp $
NAME := unique
SPECFILE = $(firstword $(wildcard *.spec))
define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef
MAKEFILE_COMMON := $(shell $(find-makefile-common))
ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif
include $(MAKEFILE_COMMON)

View file

@ -0,0 +1,29 @@
diff -urNp libunique-1.1.6.old/unique/dbus/uniquebackend-dbus.c libunique-1.1.6/unique/dbus/uniquebackend-dbus.c
--- libunique-1.1.6.old/unique/dbus/uniquebackend-dbus.c 2011-07-06 10:30:49.712128019 +0100
+++ libunique-1.1.6/unique/dbus/uniquebackend-dbus.c 2011-07-06 10:32:11.026127998 +0100
@@ -84,7 +84,6 @@ unique_backend_dbus_register_proxy (Uniq
static gboolean
unique_backend_dbus_request_name (UniqueBackend *backend)
{
- UniqueBackendDBus *backend_dbus;
const gchar *name;
DBusGConnection *connection;
DBusGProxy *proxy;
@@ -97,8 +96,6 @@ unique_backend_dbus_request_name (Unique
if (!connection)
return FALSE;
- backend_dbus = UNIQUE_BACKEND_DBUS (backend);
-
retval = TRUE;
name = unique_backend_get_name (backend);
g_assert (name != NULL);
@@ -207,7 +204,7 @@ unique_backend_dbus_send_message (Unique
cmd, data, time_,
&resp,
&error);
- if (error)
+ if (!res && error)
{
g_warning ("Error while sending message: %s", error->message);
g_error_free (error);

View file

@ -1,6 +1,6 @@
Name: unique
Version: 1.1.6
Release: 1%{?dist}
Release: 2%{?dist}
Summary: Single instance support for applications
Group: System Environment/Libraries
@ -9,6 +9,9 @@ URL: http://www.gnome.org/~ebassi/source/
Source0: http://download.gnome.org/sources/libunique/1.1/libunique-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# Fix build -- upstream dead (replaced with GtkApplication)
Patch0: fix-unused-but-set-variable.patch
BuildRequires: dbus-glib-devel
BuildRequires: gnome-doc-utils >= 0.3.2
BuildRequires: libtool
@ -35,6 +38,7 @@ Headers and libraries for Unique.
%prep
%setup -q -n libunique-%{?version}
%patch0 -p1 -b .unused-but-set-variable
%build
%configure --enable-gtk-doc --disable-static --enable-introspection=no
@ -65,6 +69,10 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/lib*.so
%changelog
* Wed Jul 06 2011 Richard Hughes <rhughes@redhat.com> - 1.1.6-2
- Fix compile.
- Resolves: #716099
* Thu Nov 12 2009 Richard Hughes <rhughes@redhat.com> - 1.1.6-1
- Update to 1.1.4
- Brown paper bag release