till pushed to mate-user-share (master). "2015-04-13: Retired orphaned package, because it was orphaned for more than six weeks."
notifications at fedoraproject.org
notifications at fedoraproject.org
Mon Apr 13 16:27:41 UTC 2015
>From 703b6aa59e4e63e9e382ac6b7a6b4e88b72c0f32 Mon Sep 17 00:00:00 2001
From: Till Maas <opensource at till.name>
Date: Mon, 13 Apr 2015 18:26:46 +0200
Subject: 2015-04-13: Retired orphaned package, because it was orphaned for
more than six weeks.
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index f6f3daf..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,9 +0,0 @@
-/mate-user-share-1.6.0.tar.xz
-/mate-user-share-1.6.1.git48b2c97.tar.xz
-/mate-user-share-1.6.1.git77a6040.tar.xz
-/mate-user-share-1.6.1-git20130919-77a6040.tar.xz
-/mate-user-share-1.7.0.tar.xz
-/mate-user-share-1.7.1-git20140210-c0f0c63.tar.xz
-/mate-user-share-1.7.90.tar.xz
-/mate-user-share-1.8.0.tar.xz
-/mate-user-share-1.9.0.tar.xz
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..9263c07
--- /dev/null
+++ b/dead.package
@@ -0,0 +1,2 @@
+2015-04-13: Retired orphaned package, because it was orphaned for more than six weeks.
+
diff --git a/mate-user-share.spec b/mate-user-share.spec
deleted file mode 100644
index f255686..0000000
--- a/mate-user-share.spec
+++ /dev/null
@@ -1,254 +0,0 @@
-# Conditional for release and snapshot builds. Uncomment for release-builds.
-%global rel_build 1
-
-# This is needed, because src-url contains branched part of versioning-scheme.
-%global branch 1.9
-
-# Settings used for build from snapshots.
-%{!?rel_build:%global commit c0f0c63c670d799dee4fa7577083d0cbace56db4}
-%{!?rel_build:%global commit_date 20140210}
-%{!?rel_build:%global shortcommit %(c=%{commit};echo ${c:0:7})}
-%{!?rel_build:%global git_ver git%{commit_date}-%{shortcommit}}
-%{!?rel_build:%global git_rel .git%{commit_date}.%{shortcommit}}
-%{!?rel_build:%global git_tar %{name}-%{version}-%{git_ver}.tar.xz}
-
-Summary: Mate user file sharing
-Name: mate-user-share
-Version: %{branch}.0
-Release: 1%{?dist}
-#Release: 0.1%{?git_rel}%{?dist}
-License: GPLv2+
-Group: System Environment/Libraries
-URL: http://mate-desktop.org
-
-# for downloading the tarball use 'spectool -g -R mate-user-share.spec'
-# Source for release-builds.
-%{?rel_build:Source0: http://pub.mate-desktop.org/releases/%{branch}/%{name}-%{version}.tar.xz}
-# Source for snapshot-builds.
-%{!?rel_build:Source0: http://git.mate-desktop.org/%{name}/snapshot/%{name}-%{commit}.tar.xz#/%{git_tar}}
-
-BuildRequires: caja-devel
-BuildRequires: dbus-glib-devel
-BuildRequires: desktop-file-utils
-BuildRequires: yelp-tools
-BuildRequires: gtk2-devel
-BuildRequires: httpd
-BuildRequires: libcanberra-devel
-BuildRequires: libICE-devel
-BuildRequires: libnotify-devel
-BuildRequires: libselinux-devel
-BuildRequires: libSM-devel
-BuildRequires: mate-common
-BuildRequires: caja-devel
-BuildRequires: mod_dnssd
-BuildRequires: perl(XML::Parser)
-BuildRequires: unique-devel
-
-# disable bluetooth support for bluez5
-%if 0%{?fedora} > 19
-#BuildRequires: mate-bluetooth-devel
-BuildRequires: caja-devel
-%else
-BuildRequires: mate-bluetooth-devel
-BuildRequires: mate-file-manager-devel
-%endif
-
-
-Requires: httpd
-# obsolete with bluez5
-%if 0%{?fedora} > 19
-#Requires: obex-data-server
-%else
-Requires: obex-data-server
-%endif
-Requires: mod_dnssd
-
-%description
-mate-user-share is a small package that binds together various free
-software projects to bring easy to use user-level file sharing to the
-masses.
-
-The program is meant to run in the background when the user is logged
-in, and when file sharing is enabled a webdav server is started that
-shares the $HOME/Public folder. The share is then published to all
-computers on the local network using mDNS/rendezvous, so that it shows
-up in the Network location in MATE.
-
-The program also allows to share files using ObexFTP over Bluetooth.
-
-%prep
-%setup -q%{!?rel_build:n %{name}-%{commit}}
-
-# nedded to create missing configure and make files
-# for git snapshot builds, comment out for release builds
-#NOCONFIGURE=1 ./autogen.sh
-
-%build
-# disable bluetooth support for bluez5
-%if 0%{?fedora} > 19
-%configure \
- --disable-static \
- --disable-bluetooth \
- --disable-schemas-compile
-%else
-%configure \
- --disable-scrollkeeper \
- --disable-static \
- --disable-schemas-compile
-%endif
-make %{?_smp_mflags}
-
-%install
-%{make_install}
-
-rm -f $RPM_BUILD_ROOT%{_libdir}/caja/extensions-2.0/*.la
-
-# no need to provide a convert file for mateconf user settings,
-# because Mate started with gsettings in f17/18
-rm -f $RPM_BUILD_ROOT%{_datadir}/MateConf/gsettings/mate-user-share.convert
-
-%find_lang %{name} --with-gnome --all-name
-
-# disable bluetooth support for bluez5
-%if 0%{?fedora} > 19
-rm -f ${RPM_BUILD_ROOT}/%{_sysconfdir}/xdg/autostart/mate-user-share-obexftp.desktop
-rm -f desktop-file-validate ${RPM_BUILD_ROOT}/%{_sysconfdir}/xdg/autostart/mate-user-share-obexpush.desktop
-desktop-file-validate ${RPM_BUILD_ROOT}/%{_datadir}/applications/mate-user-share-properties.desktop
-desktop-file-validate ${RPM_BUILD_ROOT}/%{_sysconfdir}/xdg/autostart/mate-user-share-webdav.desktop
-%else
-desktop-file-validate ${RPM_BUILD_ROOT}/%{_datadir}/applications/mate-user-share-properties.desktop
-desktop-file-validate ${RPM_BUILD_ROOT}/%{_sysconfdir}/xdg/autostart/mate-user-share-obexftp.desktop
-desktop-file-validate ${RPM_BUILD_ROOT}/%{_sysconfdir}/xdg/autostart/mate-user-share-obexpush.desktop
-desktop-file-validate ${RPM_BUILD_ROOT}/%{_sysconfdir}/xdg/autostart/mate-user-share-webdav.desktop
-%endif
-
-%post
-/bin/touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
-
-%postun
-if [ $1 -eq 0 ]; then
- /bin/touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
- /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor >&/dev/null || :
- /usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
-fi
-
-%posttrans
-/usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor >&/dev/null || :
-/usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
-
-
-%files -f %{name}.lang
-%doc README COPYING NEWS
-%{_bindir}/mate-file-share-properties
-%{_libexecdir}/mate-user-share
-%{_datadir}/mate-user-share/
-%{_datadir}/applications/mate-user-share-properties.desktop
-# disable bluetooth support for bluez5
-%if 0%{?fedora} > 19
-%{_sysconfdir}/xdg/autostart/mate-user-share-webdav.desktop
-%else
-%{_sysconfdir}/xdg/autostart/mate-user-share-obexftp.desktop
-%{_sysconfdir}/xdg/autostart/mate-user-share-obexpush.desktop
-%{_sysconfdir}/xdg/autostart/mate-user-share-webdav.desktop
-%endif
-%{_datadir}/icons/hicolor/*/apps/mate-obex-server.png
-%{_libdir}/caja/extensions-2.0/*.so
-%{_datadir}/glib-2.0/schemas/org.mate.FileSharing.gschema.xml
-%{_mandir}/man1/mate-file-share-properties.1.*
-
-
-%changelog
-* Thu Nov 20 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.9.0-1
-- update to 1.9.0 release
-
-* Sun Aug 17 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Wed Mar 05 2014 Dan Mashal <dan.mashal at fedoraproject.org> - 1.8.0-1
-- Update to 1.8.0
-
-* Wed Feb 19 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.7.90-1
-- update to 1.7.90
-
-* Mon Feb 10 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.7.1-0.1.gitc0f0c63
-- no need of using 0.4 for a release build
-- use latest git snapshot for switch to yelp
-- remove --disable-scrollkeeper flag for > f20
-- use yelp-tools as BR instead of gnome-doc-utils
-- add --with-gnome flag to find_language, needed for yelp
-- restore caja-devel as BR
-
-* Sun Feb 09 2014 Dan Mashal <dan.mashal at fedoraproject.org> - 1.7.0-1
-- Update to 1.7.0
-- Remove unused patches
-- Add gnome-doc-utils to BR
-- Make spec file a little bit easier to read
-
-* Sat Dec 21 2013 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.6.1-0.4.git20130919.77a6040
-- make Maintainers life easier and use better git snapshot usage, Thanks to Björn Esser
-- use BR caja-devel for f21
-
-* Thu Nov 21 2013 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.6.1-0.3.git77a6040
-- do not use download dir for incoming bluetooth downloads if mate-bluetooth
-- isn't installed, rhbz #(1031307)
-
-* Thu Sep 19 2013 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.6.1-0.2.git77a6040
-- update to latest git snapshot
-- remove runtime require obex-data-server for > f19
-- remove upstreamed patches
-
-* Sun Aug 25 2013 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.6.1-0.1.git48b2c97
-- update latest git snapshot
-- add manpage
-- update to apache-2.24
-- use mate-session to track the active session, remove consolkit
-- add dbus requires patch
-- add OpenBSD suffers from the same httpd race condition as the other BSDs patch
-- add fix turning on sharing not starting mate-user-share
-- add bluetooth support optional
-- add BR libICE-devel
-- add BR libSM-devel
-- remove runtime require hicolor-icon-theme
-- disable bluetooth support for fedora > f19
-- update make install macro
-
-* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Mon May 20 2013 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.6.0-3
-- remove %%check
-- add a comment for usage of autogen.sh
-
-* Sat May 11 2013 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.6.0-2
-- remove gsettings.convert file
-- add requires high-color-icon-theme
-- add desktop file check for mate-user-share.desktop
-
-* Wed Apr 03 2013 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.6.0-1
-- update to 1.6.0
-- remove upstreamed desktop file fix
-- switch to libnotify as BR
-
-* Thu Mar 21 2013 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.5.0-2
-- initial build for fedora
-
-* Thu Sep 27 2012 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.5.0-1
-- build against official fedora Mate-Desktop
-
-* Sun Sep 16 2012 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.4.1-0101
-- fix desktop files
-
-* Sun Sep 02 2012 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.4.1-0100
-- improve spec file
-- security update
-
-* Fri Jul 20 2012 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.4.1-1
-- remove mate-user-share_fix_rpm-scriplet-output.patch, it's upstreamed
-
-* Thu Jul 19 2012 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.4.0-1
-- initial package
-- spec file is based on gnome-user-share-2.30.2-4.fc15 spec file
-- add mate-user-share_fix_rpm-scriplet-output.patch
diff --git a/mate-user-share_OpenBSD-httpd-race-condition.patch b/mate-user-share_OpenBSD-httpd-race-condition.patch
deleted file mode 100644
index 80768ef..0000000
--- a/mate-user-share_OpenBSD-httpd-race-condition.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -upr mate-user-share-48b2c97-orig/src/http.c mate-user-share-48b2c97/src/http.c
---- mate-user-share-48b2c97-orig/src/http.c 2013-06-26 15:04:37.000000000 +0200
-+++ mate-user-share-48b2c97/src/http.c 2013-08-20 12:33:31.870688890 +0200
-@@ -94,7 +94,7 @@ get_port (void)
- return -1;
- }
-
--#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__)
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__) || defined(__OpenBSD__)
- /* XXX This exposes a potential race condition, but without this,
- * httpd will not start on the above listed platforms due to the fact
- * that SO_REUSEADDR is also needed when Apache binds to the listening
diff --git a/mate-user-share_add-support-for-Apache-HTTPD-2.4.patch b/mate-user-share_add-support-for-Apache-HTTPD-2.4.patch
deleted file mode 100644
index 58bfcf0..0000000
--- a/mate-user-share_add-support-for-Apache-HTTPD-2.4.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-diff -upr mate-user-share-1.6.0-orig/data/dav_user_2.2.conf mate-user-share-1.6.0/data/dav_user_2.2.conf
---- mate-user-share-1.6.0-orig/data/dav_user_2.2.conf 2013-04-02 23:49:30.000000000 +0200
-+++ mate-user-share-1.6.0/data/dav_user_2.2.conf 2013-08-20 10:53:41.381047392 +0200
-@@ -31,7 +31,7 @@ DNSSDAutoRegisterUserDir Off
-
- AuthDigestProvider file
- AuthUserFile ${XDG_CONFIG_HOME}/user-share/passwd
-- AuthGroupFile /usr/share/gnome-user-share/dav_groupfile
-+ AuthGroupFile /usr/share/mate-user-share/dav_groupfile
-
- <IfDefine RequirePasswordAlways>
- Require user guest
-diff -upr mate-user-share-1.6.0-orig/data/dav_user_2.4.conf mate-user-share-1.6.0/data/dav_user_2.4.conf
---- mate-user-share-1.6.0-orig/data/dav_user_2.4.conf 2013-08-20 10:54:57.327827065 +0200
-+++ mate-user-share-1.6.0/data/dav_user_2.4.conf 2013-07-29 23:49:01.000000000 +0200
-@@ -0,0 +1,78 @@
-+ServerRoot ${XDG_CONFIG_HOME}/user-share
-+DefaultRuntimeDir ${XDG_CONFIG_HOME}/user-share
-+PidFile pid
-+LogLevel crit
-+#LogLevel info
-+ErrorLog log
-+DAVLockDB lock
-+
-+LimitXMLRequestBody 100000
-+
-+LoadModule unixd_module ${HTTP_MODULES_PATH}/mod_unixd.so
-+LoadModule mpm_prefork_module ${HTTP_MODULES_PATH}/mod_mpm_prefork.so
-+LoadModule dav_module ${HTTP_MODULES_PATH}/mod_dav.so
-+LoadModule dav_fs_module ${HTTP_MODULES_PATH}/mod_dav_fs.so
-+LoadModule authn_core_module ${HTTP_MODULES_PATH}/mod_authn_core.so
-+LoadModule authn_file_module ${HTTP_MODULES_PATH}/mod_authn_file.so
-+LoadModule auth_digest_module ${HTTP_MODULES_PATH}/mod_auth_digest.so
-+LoadModule authz_core_module ${HTTP_MODULES_PATH}/mod_authz_core.so
-+LoadModule authz_user_module ${HTTP_MODULES_PATH}/mod_authz_user.so
-+LoadModule authz_groupfile_module ${HTTP_MODULES_PATH}/mod_authz_groupfile.so
-+LoadModule dnssd_module ${HTTP_MODULES_PATH}/mod_dnssd.so
-+
-+DNSSDEnable on
-+DNSSDAutoRegisterVHosts Off
-+DNSSDAutoRegisterUserDir Off
-+
-+<VirtualHost *>
-+ DocumentRoot ${XDG_PUBLICSHARE_DIR}
-+
-+ <Location />
-+ DAV On
-+
-+ AuthType Digest
-+ AuthName "${GUS_LOGIN_LABEL}"
-+ AuthDigestDomain /
-+
-+ AuthDigestProvider file
-+ AuthUserFile ${XDG_CONFIG_HOME}/user-share/passwd
-+ AuthGroupFile /usr/share/mate-user-share/dav_groupfile
-+
-+ <IfDefine RequirePasswordAlways>
-+ Require user guest
-+ Require group guest
-+ </IfDefine>
-+
-+ <IfDefine RequirePasswordOnWrite>
-+ <LimitExcept GET OPTIONS PROPFIND>
-+ Require user guest
-+ Require group guest
-+ </LimitExcept>
-+ </IfDefine>
-+
-+ DNSSDServiceName "${GUS_SHARE_NAME}"
-+ DNSSDServiceTypes _webdav._tcp
-+ DNSSDServiceTxtRecord u=guest
-+ </Location>
-+</VirtualHost>
-+
-+StartServers 1
-+MaxClients 3
-+
-+<IfModule mpm_prefork_module>
-+ MinSpareServers 1
-+ MaxSpareServers 1
-+</IfModule>
-+
-+<IfModule mpm_worker_module>
-+ MinSpareThreads 1
-+ MaxSpareThreads 1
-+ ThreadsPerChild 3
-+</IfModule>
-+
-+<IfModule mpm_event_module>
-+ MinSpareThreads 1
-+ MaxSpareThreads 1
-+ ThreadsPerChild 3
-+</IfModule>
-+
-diff -upr mate-user-share-1.6.0-orig/data/Makefile.am mate-user-share-1.6.0/data/Makefile.am
---- mate-user-share-1.6.0-orig/data/Makefile.am 2013-04-02 23:49:30.000000000 +0200
-+++ mate-user-share-1.6.0/data/Makefile.am 2013-08-20 10:52:45.811476905 +0200
-@@ -10,7 +10,7 @@ autostart_DATA = $(autostart_in_files:.d
- autostart_in_files = mate-user-share.desktop.in
-
- appdir = $(datadir)/mate-user-share
--app_DATA=dav_user_2.0.conf dav_user_2.2.conf dav_groupfile file-share-properties.ui
-+app_DATA=dav_user_2.0.conf dav_user_2.2.conf dav_user_2.4.conf dav_groupfile file-share-properties.ui
-
- gsettings_SCHEMAS = org.mate.FileSharing.gschema.xml
- @GSETTINGS_RULES@
diff --git a/mate-user-share_bluetooth_optional.patch b/mate-user-share_bluetooth_optional.patch
deleted file mode 100644
index 0e8b583..0000000
--- a/mate-user-share_bluetooth_optional.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-diff -upr mate-user-share-48b2c97-orig/configure.ac mate-user-share-48b2c97/configure.ac
---- mate-user-share-48b2c97-orig/configure.ac 2013-08-20 15:43:16.139823000 +0200
-+++ mate-user-share-48b2c97/configure.ac 2013-08-20 15:44:23.365511823 +0200
-@@ -56,20 +56,20 @@ if $have_dbus_1_1 ; then
- AC_DEFINE(HAVE_DBUS_1_1, 1, [Set to true if we have D-BUS 1.1])
- fi
-
--PKG_CHECK_MODULES(USER_SHARE, glib-2.0 >= 2.15.2 gio-2.0 >= 2.26 gdk-x11-2.0 gtk+-2.0 dbus-1 >= 1.1.1 dbus-glib-1 libnotify >= 0.7.0 libcanberra-gtk $DBUS_MODULES)
--AC_SUBST(USER_SHARE_CFLAGS)
--AC_SUBST(USER_SHARE_LIBS)
--
--PKG_CHECK_MODULES(BLUETOOTH, mate-bluetooth-1.0 >= 1.2.0,
-- have_bluetooth=true, have_bluetooth=false)
--AC_SUBST(BLUETOOTH_CFLAGS)
--AC_SUBST(BLUETOOTH_LIBS)
--if $have_bluetooth; then
-- AC_DEFINE(HAVE_BLUETOOTH, 1, [Set to true if mate-bluetooth support is available])
-+BLUETOOTH_PKG="mate-bluetooth-1.0 >= 1.2.0"
-+AC_ARG_ENABLE(bluetooth, AS_HELP_STRING([--disable-bluetooth],[compile without bluetooth support]),,enable_bluetooth=yes)
-+if test "x$enable_bluetooth" = "xyes"; then
-+ PKG_CHECK_MODULES(BLUETOOTH, $BLUETOOTH_PKG)
-+ AC_DEFINE(HAVE_BLUETOOTH, 1, [Set to true if mate-bluetooth support is available])
- else
-- AC_MSG_WARN([Bluetooth support is disabled.])
-+ BLUETOOTH_PKG=""
-+ AC_MSG_WARN([Bluetooth support is disabled.])
- fi
--AM_CONDITIONAL(USE_BLUETOOTH, [test "$have_bluetooth" = "true"])
-+AM_CONDITIONAL(USE_BLUETOOTH, [test "$enable_bluetooth" = "yes"])
-+
-+PKG_CHECK_MODULES(USER_SHARE, glib-2.0 >= 2.15.2 gio-2.0 >= 2.26 gdk-x11-2.0 gtk+-2.0 dbus-1 >= 1.1.1 dbus-glib-1 libnotify >= 0.7.0 libcanberra-gtk $DBUS_MODULES $BLUETOOTH_PKG)
-+AC_SUBST(USER_SHARE_CFLAGS)
-+AC_SUBST(USER_SHARE_LIBS)
-
- PKG_CHECK_MODULES(USER_SHARE_CONFIG, glib-2.0 >= 2.15.2 gio-2.0 >= 2.25.0 gtk+-2.0 >= 2.12.0 unique-1.0)
- AC_SUBST(USER_SHARE_CONFIG_CFLAGS)
-@@ -127,8 +127,6 @@ AC_SUBST(SELINUX_LIBS)
- dnl ==========================================================================
- dnl Check for the HTTPD modules path
-
--
--
- AC_ARG_WITH([modules-path],
- [AS_HELP_STRING([--with-modules-path],[Path where the httpd modules are located (default: /etc/httpd/modules/)])],
- [with_modules_path=$withval])
-@@ -145,7 +143,7 @@ AC_ARG_WITH(cajadir,
- [ac_with_cajadir=""])
-
- PKG_CHECK_MODULES(EXTENSION,
-- libcaja-extension mate-bluetooth-1.0)
-+ libcaja-extension $BLUETOOTH_PKG)
- if test "${ac_with_cajadir}" = ""; then
- ac_with_cajadir=`pkg-config --variable=extensiondir libcaja-extension`
- fi
-@@ -197,7 +195,7 @@ else
- AC_MSG_RESULT(no)
- fi
-
--AC_OUTPUT([
-+AC_CONFIG_FILES([
- Makefile
- data/Makefile
- data/icons/Makefile
-@@ -213,6 +211,14 @@ src/Makefile
- man/Makefile
- ])
-
-+AC_OUTPUT
-+
-+if test "x$enable_bluetooth" = "xyes"; then
-+ AC_MSG_NOTICE([** Bluetooth support enabled (ObexPush and ObexFTP)])
-+else
-+ AC_MSG_NOTICE([ Bluetooth support disabled])
-+fi
-+
- echo "
- Do note Apache 2.2 and mod_dnssd 0.6 are required to use mate-user-share.
- "
-diff -upr mate-user-share-48b2c97-orig/src/share-extension.c mate-user-share-48b2c97/src/share-extension.c
---- mate-user-share-48b2c97-orig/src/share-extension.c 2013-08-20 15:43:30.566971000 +0200
-+++ mate-user-share-48b2c97/src/share-extension.c 2013-08-20 15:44:07.370348050 +0200
-@@ -27,10 +27,13 @@
- #include <string.h>
- #include <glib/gi18n-lib.h>
- #include <gtk/gtk.h>
--#include <bluetooth-client.h>
- #include <libcaja-extension/caja-menu-provider.h>
- #include <libcaja-extension/caja-location-widget-provider.h>
-
-+#ifdef HAVE_BLUETOOTH
-+#include <bluetooth-client.h>
-+#endif
-+
- #include "caja-share-bar.h"
- #include "user_share-common.h"
-
-@@ -101,6 +104,7 @@ bar_response_cb (CajaShareBar *bar,
- }
- }
-
-+#ifdef HAVE_BLUETOOTH
- static void
- downloads_bar_set_from_bluetooth_status (GtkWidget *bar)
- {
-@@ -121,6 +125,7 @@ default_adapter_powered_cb (GObject *
- {
- downloads_bar_set_from_bluetooth_status (bar);
- }
-+#endif /* HAVE_BLUETOOTH */
-
- static GtkWidget *
- caja_user_share_get_location_widget (CajaLocationWidgetProvider *iface,
-@@ -163,8 +168,13 @@ caja_user_share_get_location_widget (Caj
- if (is_dir[0] != FALSE && is_dir[1] != FALSE) {
- bar = caja_share_bar_new (_("May be used to share or receive files"));
- } else if (is_dir[0] != FALSE) {
-+#ifndef HAVE_BLUETOOTH
- bar = caja_share_bar_new (_("May be shared over the network or Bluetooth"));
-+#else
-+ bar = caja_share_bar_new (_("May be shared over the network"));
-+#endif /* !HAVE_BLUETOOTH */
- } else {
-+#ifdef HAVE_BLUETOOTH
- BluetoothClient *client;
-
- bar = caja_share_bar_new (_("May be used to receive files over Bluetooth"));
-@@ -175,6 +185,7 @@ caja_user_share_get_location_widget (Caj
- g_signal_connect (G_OBJECT (client), "notify::default-adapter-powered",
- G_CALLBACK (default_adapter_powered_cb), bar);
- downloads_bar_set_from_bluetooth_status (bar);
-+#endif /* HAVE_BLUETOOTH */
- }
-
- g_signal_connect (bar, "response",
diff --git a/mate-user-share_dbus-requires.patch b/mate-user-share_dbus-requires.patch
deleted file mode 100644
index d5f1230..0000000
--- a/mate-user-share_dbus-requires.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff -upr mate-user-share-1.6.0-orig/configure.ac mate-user-share-1.6.0/configure.ac
---- mate-user-share-1.6.0-orig/configure.ac 2013-04-02 23:49:30.000000000 +0200
-+++ mate-user-share-1.6.0/configure.ac 2013-08-20 11:23:50.296203565 +0200
-@@ -56,7 +56,7 @@ if $have_dbus_1_1 ; then
- AC_DEFINE(HAVE_DBUS_1_1, 1, [Set to true if we have D-BUS 1.1])
- fi
-
--PKG_CHECK_MODULES(USER_SHARE, glib-2.0 >= 2.15.2 gio-2.0 >= 2.26 gdk-x11-2.0 gtk+-2.0 dbus-glib-1 libnotify >= 0.7.0 libcanberra-gtk $DBUS_MODULES)
-+PKG_CHECK_MODULES(USER_SHARE, glib-2.0 >= 2.15.2 gio-2.0 >= 2.26 gdk-x11-2.0 gtk+-2.0 dbus-1 >= 1.1.1 dbus-glib-1 libnotify >= 0.7.0 libcanberra-gtk $DBUS_MODULES)
- AC_SUBST(USER_SHARE_CFLAGS)
- AC_SUBST(USER_SHARE_LIBS)
-
-diff -upr mate-user-share-1.6.0-orig/src/http.c mate-user-share-1.6.0/src/http.c
---- mate-user-share-1.6.0-orig/src/http.c 2013-04-02 23:49:30.000000000 +0200
-+++ mate-user-share-1.6.0/src/http.c 2013-08-20 11:26:49.691084599 +0200
-@@ -26,10 +26,7 @@
- #include <glib.h>
- #include <glib/gi18n.h>
- #include <X11/Xlib.h>
--
--#ifdef HAVE_DBUS_1_1
- #include <dbus/dbus.h>
--#endif
-
- #include <gio/gio.h>
-
-@@ -57,9 +54,7 @@
-
- #define GSETTINGS_SCHEMA "org.mate.FileSharing"
-
--#ifdef HAVE_DBUS_1_1
- static char *dbus_session_id;
--#endif
-
- static pid_t httpd_pid = 0;
-
-@@ -155,7 +150,6 @@ get_share_name (void)
- return name;
- }
-
--#ifdef HAVE_DBUS_1_1
- static void
- init_dbus() {
- /* The only use we make of D-BUS is to fetch the session BUS ID so we can export
-@@ -190,7 +184,6 @@ init_dbus() {
- dbus_connection_close(connection);
- dbus_connection_unref(connection);
- }
--#endif
-
- static void
- ensure_conf_dir (void)
-@@ -470,9 +463,7 @@ http_down (void)
- gboolean
- http_init (void)
- {
--#ifdef HAVE_DBUS_1_1
- init_dbus();
--#endif
-
- return TRUE;
- }
diff --git a/mate-user-share_download-dir.patch b/mate-user-share_download-dir.patch
deleted file mode 100644
index 7d57484..0000000
--- a/mate-user-share_download-dir.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/src/share-extension.c b/src/share-extension.c
-index 2dd331a..bbc34ff 100644
---- a/src/share-extension.c
-+++ b/src/share-extension.c
-@@ -137,9 +137,15 @@
- guint i;
- gboolean enable = FALSE;
- GFile *home;
-+#ifdef HAVE_BLUETOOTH
- const GUserDirectory special_dirs[] = { G_USER_DIRECTORY_PUBLIC_SHARE, G_USER_DIRECTORY_DOWNLOAD };
-+
- gboolean is_dir[] = { FALSE, FALSE };
-+#else
-+ const GUserDirectory special_dirs[] = { G_USER_DIRECTORY_PUBLIC_SHARE };
-
-+ gboolean is_dir[] = { FALSE };
-+#endif
- file = g_file_new_for_uri (uri);
- home = g_file_new_for_path (g_get_home_dir ());
-
-
diff --git a/mate-user-share_fix-turning-on-sharing-not-starting-m-u-s.patch b/mate-user-share_fix-turning-on-sharing-not-starting-m-u-s.patch
deleted file mode 100644
index a4a6438..0000000
--- a/mate-user-share_fix-turning-on-sharing-not-starting-m-u-s.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-diff -upr mate-user-share-48b2c97-orig/configure.ac mate-user-share-48b2c97/configure.ac
---- mate-user-share-48b2c97-orig/configure.ac 2013-06-26 15:04:37.000000000 +0200
-+++ mate-user-share-48b2c97/configure.ac 2013-08-20 12:54:27.203535515 +0200
-@@ -205,7 +205,9 @@ data/icons/16x16/Makefile
- data/icons/22x22/Makefile
- data/icons/32x32/Makefile
- data/icons/48x48/Makefile
--data/mate-user-share.desktop.in
-+data/mate-user-share-webdav.desktop.in
-+data/mate-user-share-obexftp.desktop.in
-+data/mate-user-share-obexpush.desktop.in
- po/Makefile.in
- src/Makefile
- man/Makefile
-diff -upr mate-user-share-48b2c97-orig/data/Makefile.am mate-user-share-48b2c97/data/Makefile.am
---- mate-user-share-48b2c97-orig/data/Makefile.am 2013-06-26 15:04:37.000000000 +0200
-+++ mate-user-share-48b2c97/data/Makefile.am 2013-08-20 12:58:29.860026054 +0200
-@@ -7,7 +7,7 @@ desktop_in_files = mate-user-share-prope
-
- autostartdir = $(sysconfdir)/xdg/autostart/
- autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
--autostart_in_files = mate-user-share.desktop.in
-+autostart_in_files = mate-user-share-obexftp.desktop.in mate-user-share-obexpush.desktop.in mate-user-share-webdav.desktop.in
-
- appdir = $(datadir)/mate-user-share
- app_DATA=dav_user_2.0.conf dav_user_2.2.conf dav_user_2.4.conf dav_groupfile file-share-properties.ui
-@@ -21,7 +21,9 @@ convert_DATA = mate-user-share.convert
- EXTRA_DIST = $(gsettings_SCHEMAS) \
- $(app_DATA) \
- $(desktop_in_files) \
-- mate-user-share.desktop.in.in \
-+ mate-user-share-obexftp.desktop.in.in \
-+ mate-user-share-obexpush.desktop.in.in \
-+ mate-user-share-webdav.desktop.in.in
- file-share-properties.ui
-
- CLEANFILES = $(desktop_DATA) $(autostart_DATA)
-diff -upr mate-user-share-48b2c97-orig/data/mate-user-share.desktop.in.in mate-user-share-48b2c97/data/mate-user-share.desktop.in.in
---- mate-user-share-48b2c97-orig/data/mate-user-share.desktop.in.in 2013-06-26 15:04:37.000000000 +0200
-+++ mate-user-share-48b2c97/data/mate-user-share.desktop.in.in 2013-08-20 13:09:32.014813729 +0200
-@@ -1,9 +0,0 @@
--[Desktop Entry]
--_Name=Personal File Sharing
--_Comment=Launch Personal File Sharing if enabled
--Icon=folder-remote
--Exec=@installdir@/mate-user-share
--Terminal=false
--Type=Application
--Categories=
--OnlyShowIn=MATE;
-diff -upr mate-user-share-48b2c97-orig/data/mate-user-share-obexftp.desktop.in.in mate-user-share-48b2c97/data/mate-user-share-obexftp.desktop.in.in
---- mate-user-share-48b2c97-orig/data/mate-user-share-obexftp.desktop.in.in 2013-08-20 13:07:50.593774254 +0200
-+++ mate-user-share-48b2c97/data/mate-user-share-obexftp.desktop.in.in 2013-08-20 14:24:04.927457312 +0200
-@@ -0,0 +1,11 @@
-+[Desktop Entry]
-+_Name=Personal File Sharing obexftp
-+_Comment=Launch Personal File Sharing if enabled
-+_Keywords=share;files;bluetooth;obex;http;network;copy;send;
-+AutostartCondition=GSettings org.mate.FileSharing bluetooth-enabled
-+Icon=folder-remote
-+Exec=@installdir@/mate-user-share
-+Terminal=false
-+Type=Application
-+Categories=
-+OnlyShowIn=MATE;
-diff -upr mate-user-share-48b2c97-orig/data/mate-user-share-obexpush.desktop.in.in mate-user-share-48b2c97/data/mate-user-share-obexpush.desktop.in.in
---- mate-user-share-48b2c97-orig/data/mate-user-share-obexpush.desktop.in.in 2013-08-20 13:08:01.650887577 +0200
-+++ mate-user-share-48b2c97/data/mate-user-share-obexpush.desktop.in.in 2013-08-20 14:24:17.756588872 +0200
-@@ -0,0 +1,11 @@
-+[Desktop Entry]
-+_Name=Personal File Sharing obexpush
-+_Comment=Launch Personal File Sharing if enabled
-+_Keywords=share;files;bluetooth;obex;http;network;copy;send;
-+AutostartCondition=GSettings org.mate.FileSharing bluetooth-obexpush-enabled
-+Icon=folder-remote
-+Exec=@installdir@/mate-user-share
-+Terminal=false
-+Type=Application
-+Categories=
-+OnlyShowIn=MATE;
-diff -upr mate-user-share-48b2c97-orig/data/mate-user-share-webdav.desktop.in.in mate-user-share-48b2c97/data/mate-user-share-webdav.desktop.in.in
---- mate-user-share-48b2c97-orig/data/mate-user-share-webdav.desktop.in.in 2013-08-20 13:08:14.116015332 +0200
-+++ mate-user-share-48b2c97/data/mate-user-share-webdav.desktop.in.in 2013-08-20 14:24:33.341748696 +0200
-@@ -0,0 +1,11 @@
-+[Desktop Entry]
-+_Name=Personal File Sharing webdav
-+_Comment=Launch Personal File Sharing if enabled
-+_Keywords=share;files;bluetooth;obex;http;network;copy;send;
-+AutostartCondition=GSettings org.mate.FileSharing enabled
-+Icon=folder-remote
-+Exec=@installdir@/mate-user-share
-+Terminal=false
-+Type=Application
-+Categories=
-+OnlyShowIn=MATE;
-diff -upr mate-user-share-48b2c97-orig/po/POTFILES.in mate-user-share-48b2c97/po/POTFILES.in
---- mate-user-share-48b2c97-orig/po/POTFILES.in 2013-06-26 15:04:37.000000000 +0200
-+++ mate-user-share-48b2c97/po/POTFILES.in 2013-08-20 13:11:01.616732096 +0200
-@@ -3,7 +3,9 @@
- data/desktop_mate_file_sharing.schemas.in
- [type: gettext/glade]data/file-share-properties.ui
- data/mate-user-share-properties.desktop.in
--data/mate-user-share.desktop.in.in
-+data/mate-user-share-obexftp.desktop.in.in
-+data/mate-user-share-obexpush.desktop.in.in
-+data/mate-user-share-webdav.desktop.in.in
- src/caja-share-bar.c
- src/share-extension.c
- src/file-share-properties.c
-diff -upr mate-user-share-48b2c97-orig/po/POTFILES.skip mate-user-share-48b2c97/po/POTFILES.skip
---- mate-user-share-48b2c97-orig/po/POTFILES.skip 2013-06-26 15:04:37.000000000 +0200
-+++ mate-user-share-48b2c97/po/POTFILES.skip 2013-08-20 13:11:42.557151723 +0200
-@@ -1,4 +1,6 @@
- # List of source files that should NOT be translated.
- # Please keep this file sorted alphabetically.
- data/file-share-properties.ui
--data/mate-user-share.desktop.in
-+data/mate-user-share-obexftp.desktop.in.in
-+data/mate-user-share-obexpush.desktop.in.in
-+data/mate-user-share-webdav.desktop.in.in
diff --git a/mate-user-share_use-mate-session-to-track-active-session.patch b/mate-user-share_use-mate-session-to-track-active-session.patch
deleted file mode 100644
index 160f281..0000000
--- a/mate-user-share_use-mate-session-to-track-active-session.patch
+++ /dev/null
@@ -1,238 +0,0 @@
-diff -upr mate-user-share-1.6.0-orig/configure.ac mate-user-share-1.6.0/configure.ac
---- mate-user-share-1.6.0-orig/configure.ac 2013-04-02 23:49:30.000000000 +0200
-+++ mate-user-share-1.6.0/configure.ac 2013-08-20 10:59:49.042821889 +0200
-@@ -56,7 +56,7 @@ if $have_dbus_1_1 ; then
- AC_DEFINE(HAVE_DBUS_1_1, 1, [Set to true if we have D-BUS 1.1])
- fi
-
--PKG_CHECK_MODULES(USER_SHARE, glib-2.0 >= 2.15.2 gio-2.0 >= 2.25.0 gdk-x11-2.0 gtk+-2.0 dbus-glib-1 libnotify >= 0.7.0 libcanberra-gtk $DBUS_MODULES)
-+PKG_CHECK_MODULES(USER_SHARE, glib-2.0 >= 2.15.2 gio-2.0 >= 2.26 gdk-x11-2.0 gtk+-2.0 dbus-glib-1 libnotify >= 0.7.0 libcanberra-gtk $DBUS_MODULES)
- AC_SUBST(USER_SHARE_CFLAGS)
- AC_SUBST(USER_SHARE_LIBS)
-
-diff -upr mate-user-share-1.6.0-orig/src/user_share.c mate-user-share-1.6.0/src/user_share.c
---- mate-user-share-1.6.0-orig/src/user_share.c 2013-04-02 23:49:30.000000000 +0200
-+++ mate-user-share-1.6.0/src/user_share.c 2013-08-20 11:12:29.632047478 +0200
-@@ -27,6 +27,7 @@
- #include <gtk/gtk.h>
- #include <glib/gi18n.h>
- #include <glib/gstdio.h>
-+#include <gio/gio.h>
- #include <X11/Xlib.h>
-
- #include "user_share.h"
-@@ -61,14 +62,12 @@ static GSettings* settings;
- #define GSETTINGS_KEY_FILE_SHARING_REQUIRE_PASSWORD "require-password"
-
- #ifdef HAVE_BLUETOOTH
--/* ConsoleKit */
--#define CK_NAME "org.freedesktop.ConsoleKit"
--#define CK_INTERFACE "org.freedesktop.ConsoleKit"
--#define CK_MANAGER_PATH "/org/freedesktop/ConsoleKit/Manager"
--#define CK_MANAGER_INTERFACE "org.freedesktop.ConsoleKit.Manager"
--#define CK_SEAT_INTERFACE "org.freedesktop.ConsoleKit.Seat"
--#define CK_SESSION_INTERFACE "org.freedesktop.ConsoleKit.Session"
-+/* MATE Session */
-+#define MATE_SESSION_DBUS_NAME "org.mate.SessionManager"
-+#define MATE_SESSION_DBUS_OBJECT "/org/mate/SessionManager"
-+#define MATE_SESSION_DBUS_INTERFACE "org.mate.SessionManager"
-
-+static GDBusProxy *session_proxy = NULL;
- static gboolean has_console = TRUE;
-
- static BluetoothClient *client = NULL;
-@@ -113,136 +112,65 @@ obex_services_shutdown (void)
- }
-
- static void
--sessionchanged_cb (void)
--{
-- DBusGConnection *dbus_connection;
-- DBusGProxy *proxy_ck_manager;
-- DBusGProxy *proxy_ck_session;
-+session_properties_changed_cb (GDBusProxy *session,
-+ GVariant *changed,
-+ char **invalidated,
-+ gpointer user_data)
-+{
-+ GVariant *v;
-+
-+ v = g_variant_lookup_value (changed, "SessionIsActive", G_VARIANT_TYPE_BOOLEAN);
-+ if (v) {
-+ has_console = g_variant_get_boolean (v);
-+ g_debug ("Received session is active change: now %s", has_console ? "active" : "inactive");
-+
-+ if (has_console)
-+ obex_services_start ();
-+ else
-+ obex_services_shutdown ();
-
-- gchar *ck_session_path;
-- gboolean is_active = FALSE;
-- GError *error = NULL;
-+ g_variant_unref (v);
-+ }
-+}
-
-- g_message ("Active session changed");
-+static gboolean
-+is_session_active (void)
-+{
-+ GVariant *variant;
-+ gboolean is_session_active = FALSE;
-
-- dbus_connection = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error);
-- if (!dbus_connection) {
-- g_warning ("Unable to connect to dbus");
-- dbus_g_connection_unref (dbus_connection);
-- return;
-- }
--
-- proxy_ck_manager = dbus_g_proxy_new_for_name (dbus_connection,
-- CK_NAME,
-- CK_MANAGER_PATH,
-- CK_MANAGER_INTERFACE);
-- if (dbus_g_proxy_call (proxy_ck_manager, "GetCurrentSession",
-- &error, G_TYPE_INVALID,
-- DBUS_TYPE_G_OBJECT_PATH, &ck_session_path,
-- G_TYPE_INVALID) == FALSE) {
-- g_warning ("Couldn't request the name: %s", error->message);
-- dbus_g_connection_unref (dbus_connection);
-- g_object_unref (proxy_ck_manager);
-- g_error_free (error);
-- return;
-- }
--
-- proxy_ck_session = dbus_g_proxy_new_for_name (dbus_connection,
-- CK_NAME,
-- ck_session_path,
-- CK_SESSION_INTERFACE);
--
-- if (dbus_g_proxy_call (proxy_ck_session, "IsActive",
-- &error, G_TYPE_INVALID,
-- G_TYPE_BOOLEAN, &is_active,
-- G_TYPE_INVALID) == FALSE) {
--
-- g_warning ("Couldn't request the name: %s", error->message);
-- dbus_g_connection_unref (dbus_connection);
-- g_object_unref (proxy_ck_manager);
-- g_object_unref (proxy_ck_session);
-- g_error_free (error);
-- return;
-- }
--
-- has_console = is_active;
-- if (is_active) {
-- obex_services_start ();
-- } else {
-- obex_services_shutdown ();
-- }
-+ variant = g_dbus_proxy_get_cached_property (session_proxy,
-+ "SessionIsActive");
-+ if (variant) {
-+ is_session_active = g_variant_get_boolean (variant);
-+ g_variant_unref (variant);
-+ }
-
-- dbus_g_connection_unref (dbus_connection);
-- g_free (ck_session_path);
-- g_object_unref (proxy_ck_manager);
-- g_object_unref (proxy_ck_session);
-- if (error != NULL) {
-- g_error_free (error);
-- }
-+ return is_session_active;
- }
-
- static void
--consolekit_init (void)
-+session_init (void)
- {
-- DBusGConnection *dbus_connection;
-- DBusGProxy *proxy_ck_manager;
-- DBusGProxy *proxy_ck_session;
-- DBusGProxy *proxy_ck_seat;
-- gchar *ck_session_path;
-- gchar *ck_seat_path;
- GError *error = NULL;
-
-- dbus_connection = dbus_g_bus_get (DBUS_BUS_SYSTEM, NULL);
--
-- if (!dbus_connection) {
-- g_warning ("Unable to connect to dbus");
-- dbus_g_connection_unref (dbus_connection);
-- return;
-- }
--
-- proxy_ck_manager = dbus_g_proxy_new_for_name (dbus_connection,
-- CK_NAME,
-- CK_MANAGER_PATH,
-- CK_MANAGER_INTERFACE);
-- if (dbus_g_proxy_call (proxy_ck_manager, "GetCurrentSession",
-- &error, G_TYPE_INVALID,
-- DBUS_TYPE_G_OBJECT_PATH, &ck_session_path,
-- G_TYPE_INVALID) == FALSE) {
--
-- g_warning ("Couldn't request the name: %s", error->message);
-- g_object_unref (proxy_ck_manager);
-- return;
-- }
--
-- proxy_ck_session = dbus_g_proxy_new_for_name (dbus_connection,
-- CK_NAME,
-- ck_session_path,
-- CK_SESSION_INTERFACE);
-- if (dbus_g_proxy_call (proxy_ck_session, "GetSeatId",
-- &error, G_TYPE_INVALID,
-- DBUS_TYPE_G_OBJECT_PATH, &ck_seat_path,
-- G_TYPE_INVALID) == FALSE) {
--
-- g_warning ("Couldn't request the name: %s", error->message);
-- g_object_unref (proxy_ck_session);
-- return;
-- }
--
-- proxy_ck_seat = dbus_g_proxy_new_for_name (dbus_connection,
-- CK_NAME,
-- ck_seat_path,
-- CK_SEAT_INTERFACE);
-- dbus_g_proxy_add_signal (proxy_ck_seat, "ActiveSessionChanged",
-- G_TYPE_STRING, G_TYPE_INVALID);
-- dbus_g_proxy_connect_signal (proxy_ck_seat, "ActiveSessionChanged",
-- G_CALLBACK (sessionchanged_cb), NULL, NULL);
-- if (error != NULL) {
-- g_error_free (error);
-- }
-- g_object_unref (proxy_ck_manager);
-- g_object_unref (proxy_ck_session);
-- g_free (ck_seat_path);
-- dbus_g_connection_unref (dbus_connection);
-+ session_proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
-+ G_DBUS_PROXY_FLAGS_NONE,
-+ NULL,
-+ MATE_SESSION_DBUS_NAME,
-+ MATE_SESSION_DBUS_OBJECT,
-+ MATE_SESSION_DBUS_INTERFACE,
-+ NULL,
-+ &error);
-+ if (session_proxy == NULL) {
-+ g_warning ("Failed to get session proxy: %s", error->message);
-+ g_error_free (error);
-+ return;
-+ }
-+ g_signal_connect (session_proxy, "g-properties-changed",
-+ G_CALLBACK (session_properties_changed_cb),
-+ NULL);
-+ has_console = is_session_active ();
- }
-
- static void
-@@ -549,7 +477,7 @@ main (int argc, char **argv)
- G_CALLBACK (file_sharing_bluetooth_obexpush_notify_changed), NULL);
-
- bluez_init ();
-- consolekit_init ();
-+ session_init ();
- #endif /* HAVE_BLUETOOTH */
-
- /* Initial setting */
diff --git a/sources b/sources
deleted file mode 100644
index 9ba69fa..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-60fed6f0b909c8005eee7f14012ade3c mate-user-share-1.9.0.tar.xz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/mate-user-share.git/commit/?h=master&id=703b6aa59e4e63e9e382ac6b7a6b4e88b72c0f32
More information about the scm-commits
mailing list