Hello community, here is the log from the commit of package mate-user-share for openSUSE:Factory checked in at 2015-11-11 10:30:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mate-user-share (Old) and /work/SRC/openSUSE:Factory/.mate-user-share.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mate-user-share" Changes: -------- --- /work/SRC/openSUSE:Factory/mate-user-share/mate-user-share.changes 2015-07-03 00:10:07.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mate-user-share.new/mate-user-share.changes 2015-11-11 10:35:10.000000000 +0100 @@ -1,0 +2,15 @@ +Thu Nov 5 20:43:01 UTC 2015 - [email protected] + +- Update to 1.12.0. + +------------------------------------------------------------------- +Wed Oct 14 22:24:48 UTC 2015 - [email protected] + +- Update to 1.11.0: + * Switch to org.gnome.SessionManager (used for BT services + start/stop). + * Drop useless dependency on dbus-1. + * Drop Apache 2.0 support. + * Some more cleanups. + +------------------------------------------------------------------- Old: ---- mate-user-share-1.10.0.tar.xz New: ---- mate-user-share-1.12.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mate-user-share.spec ++++++ --- /var/tmp/diff_new_pack.59IQVn/_old 2015-11-11 10:35:11.000000000 +0100 +++ /var/tmp/diff_new_pack.59IQVn/_new 2015-11-11 10:35:11.000000000 +0100 @@ -16,31 +16,29 @@ # -%define _version 1.10 +%define _version 1.12 Name: mate-user-share -Version: 1.10.0 +Version: 1.12.0 Release: 0 Summary: MATE Desktop file sharing for the masses License: GPL-2.0+ Group: System/GUI/Other -Url: http://mate-desktop.org +Url: http://mate-desktop.org/ Source: http://pub.mate-desktop.org/releases/%{_version}/%{name}-%{version}.tar.xz -BuildRequires: apache2-devel BuildRequires: gnome-doc-utils BuildRequires: hicolor-icon-theme -BuildRequires: mate-common >= 1.9.0 +BuildRequires: mate-common >= %{_version} BuildRequires: update-desktop-files BuildRequires: yelp-tools BuildRequires: pkgconfig(dbus-glib-1) BuildRequires: pkgconfig(gdk-x11-2.0) BuildRequires: pkgconfig(gtk+-2.0) -BuildRequires: pkgconfig(libcaja-extension) >= 1.9.0 +BuildRequires: pkgconfig(libcaja-extension) >= %{_version} BuildRequires: pkgconfig(libcanberra-gtk) BuildRequires: pkgconfig(libnotify) #BuildRequires: pkgconfig(mate-bluetooth-1.0) BuildRequires: pkgconfig(unique-1.0) -Requires: apache2-mod_dnssd -Recommends: %{name}-lang = %{version} +Recommends: %{name}-lang %glib2_gsettings_schema_requires %description ++++++ mate-user-share-1.10.0.tar.xz -> mate-user-share-1.12.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mate-user-share-1.10.0/ChangeLog new/mate-user-share-1.12.0/ChangeLog --- old/mate-user-share-1.10.0/ChangeLog 2015-05-06 19:38:34.000000000 +0200 +++ new/mate-user-share-1.12.0/ChangeLog 2015-11-05 09:27:35.000000000 +0100 @@ -1,3 +1,141 @@ +commit f4f63f51a5925dbf10242a9cf85c9b2d4f9f9fa0 +Author: Clement Lefebvre <[email protected]> +Date: Tue Nov 3 14:57:11 2015 +0000 + + 1.12.0 + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit d87f134b9612469bb4a567b98f771147b91fe001 +Author: Clement Lefebvre <[email protected]> +Date: Tue Nov 3 14:56:58 2015 +0000 + + Sync translations with transifex + + po/hy.po | 252 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 252 insertions(+) + +commit 233a3c0e2caae3497fcb457f7cd6500f6a757913 +Author: monsta <[email protected]> +Date: Fri Oct 30 16:43:09 2015 +0300 + + update NEWS for 1.12 + + NEWS | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 342c72ea5781d409b199d5337ebb6b9114d193d4 +Author: monsta <[email protected]> +Date: Fri Oct 9 14:23:38 2015 +0300 + + Add NEWS for 1.11.0 + + NEWS | 4 ++++ + 1 file changed, 4 insertions(+) + +commit e174a16da5ae7feb2f2579ae442cab1d2ec6ed5c +Author: raveit65 <[email protected]> +Date: Tue Oct 6 18:11:22 2015 +0200 + + pre-bump version to 1.11.0 + + NEWS | 2 ++ + configure.ac | 2 +- + 2 files changed, 3 insertions(+), 1 deletion(-) + +commit 391023c7de9819ad9eb47e6ceea374cb4ff19284 +Merge: 9712b02 d8b8c33 +Author: Martin Wimpress <[email protected]> +Date: Mon Sep 28 09:15:21 2015 +0100 + + Merge pull request #36 from monsta/cleanup + + configure.ac: drop dbus-1 requirement + +commit d8b8c3311253008c065c1033b5e073d02d3092ef +Author: Monsta <[email protected]> +Date: Fri Sep 25 10:25:41 2015 +0300 + + configure.ac: drop dbus-1 requirement + + not needed after https://github.com/mate-desktop/mate-user-share/commit/dadcc6243c6f3a7bcf7aba443816c50e987fc6e4 + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9712b02bf86cf5a4f8bab7e55a156e2ac937e315 +Merge: dadcc62 1d22e70 +Author: Martin Wimpress <[email protected]> +Date: Wed Sep 23 16:42:56 2015 +0100 + + Merge pull request #35 from monsta/ancient + + some cleanup + +commit 1d22e70e9aa963f762391ca1eacfcbf16bb4375e +Author: Monsta <[email protected]> +Date: Tue Sep 8 17:07:14 2015 +0300 + + configure.ac: indicate that we support apache >= 2.2, not just 2.2 + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 5487116f2f65631346038d7192e2d9e7297d0bfa +Author: Monsta <[email protected]> +Date: Tue Sep 8 16:49:32 2015 +0300 + + drop apache 2.0 config, it's ancient + + data/Makefile.am | 2 +- + data/dav_user_2.0.conf | 40 ---------------------------------------- + 2 files changed, 1 insertion(+), 41 deletions(-) + +commit dadcc6243c6f3a7bcf7aba443816c50e987fc6e4 +Author: Monsta <[email protected]> +Date: Tue Aug 25 17:59:55 2015 +0300 + + some cleanup from upstream + + https://git.gnome.org/browse/gnome-user-share/commit/?id=447db6a8eaf551fd9de53d600885847d1e1eb0ac + https://git.gnome.org/browse/gnome-user-share/commit/?id=032d88e1c4e89bef92540b3e613f5ad7baa6bedb + https://git.gnome.org/browse/gnome-user-share/commit/?id=2bbc6384cb0d8a85dcf0208ec5d75d28e2d89049 + + src/http.c | 44 ++------------------------------------------ + src/user_share.c | 2 -- + 2 files changed, 2 insertions(+), 44 deletions(-) + +commit 7d6ade70a6012a72f6d98d4f86b73a41dfbcb28a +Author: monsta <[email protected]> +Date: Wed Aug 19 10:53:56 2015 +0300 + + configure.ac: drop obsolete macro + + It's been a no-op for a long time. + See https://mail.gnome.org/archives/commits-list/2011-December/msg00681.html for example. + + configure.ac | 1 - + 1 file changed, 1 deletion(-) + +commit 017c4afd935c91720edcc107543eaa85182d2087 +Author: Clement Lefebvre <[email protected]> +Date: Fri Sep 4 22:08:24 2015 +0100 + + Switch to org.gnome.SessionManager + + src/user_share.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 973b934698ef3113e03411c41fe14b896d3bc194 +Author: Monsta <[email protected]> +Date: Fri Jul 10 10:27:05 2015 +0300 + + help: corrected feedback page link + + help/C/index.docbook | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + commit 700b653b28ce1a2d697c5c4280039612fd6ddc8c Author: Stefano Karapetsas <[email protected]> Date: Wed May 6 19:38:20 2015 +0200 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mate-user-share-1.10.0/Makefile.in new/mate-user-share-1.12.0/Makefile.in --- old/mate-user-share-1.10.0/Makefile.in 2015-05-06 19:38:28.000000000 +0200 +++ new/mate-user-share-1.12.0/Makefile.in 2015-11-05 09:27:22.000000000 +0100 @@ -82,7 +82,7 @@ $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/configure $(am__configure_deps) \ $(srcdir)/config.h.in COPYING compile config.guess config.sub \ - install-sh missing ltmain.sh + depcomp install-sh missing ltmain.sh ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mate-user-share-1.10.0/NEWS new/mate-user-share-1.12.0/NEWS --- old/mate-user-share-1.10.0/NEWS 2015-05-06 19:38:15.000000000 +0200 +++ new/mate-user-share-1.12.0/NEWS 2015-10-30 14:42:52.000000000 +0100 @@ -1,3 +1,9 @@ +1.12.0 + * Switch to org.gnome.SessionManager (used for BT services start/stop) + * Drop useless dependency on dbus-1 + * Drop Apache 2.0 support + * Some more cleanups + 1.10.0 * Add GTK3 support diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mate-user-share-1.10.0/configure new/mate-user-share-1.12.0/configure --- old/mate-user-share-1.10.0/configure 2015-05-06 19:38:27.000000000 +0200 +++ new/mate-user-share-1.12.0/configure 2015-11-05 09:27:21.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for mate-user-share 1.10.0. +# Generated by GNU Autoconf 2.69 for mate-user-share 1.12.0. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -587,8 +587,8 @@ # Identity of this package. PACKAGE_NAME='mate-user-share' PACKAGE_TARNAME='mate-user-share' -PACKAGE_VERSION='1.10.0' -PACKAGE_STRING='mate-user-share 1.10.0' +PACKAGE_VERSION='1.12.0' +PACKAGE_STRING='mate-user-share 1.12.0' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1416,7 +1416,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures mate-user-share 1.10.0 to adapt to many kinds of systems. +\`configure' configures mate-user-share 1.12.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1490,7 +1490,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of mate-user-share 1.10.0:";; + short | recursive ) echo "Configuration of mate-user-share 1.12.0:";; esac cat <<\_ACEOF @@ -1635,7 +1635,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -mate-user-share configure 1.10.0 +mate-user-share configure 1.12.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2054,7 +2054,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by mate-user-share $as_me 1.10.0, which was +It was created by mate-user-share $as_me 1.12.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2918,7 +2918,7 @@ # Define the identity of the package. PACKAGE='mate-user-share' - VERSION='1.10.0' + VERSION='1.12.0' cat >>confdefs.h <<_ACEOF @@ -5147,62 +5147,6 @@ fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5 -$as_echo_n "checking for library containing strerror... " >&6; } -if ${ac_cv_search_strerror+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_func_search_save_LIBS=$LIBS -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char strerror (); -int -main () -{ -return strerror (); - ; - return 0; -} -_ACEOF -for ac_lib in '' cposix; do - if test -z "$ac_lib"; then - ac_res="none required" - else - ac_res=-l$ac_lib - LIBS="-l$ac_lib $ac_func_search_save_LIBS" - fi - if ac_fn_c_try_link "$LINENO"; then : - ac_cv_search_strerror=$ac_res -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext - if ${ac_cv_search_strerror+:} false; then : - break -fi -done -if ${ac_cv_search_strerror+:} false; then : - -else - ac_cv_search_strerror=no -fi -rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_strerror" >&5 -$as_echo "$ac_cv_search_strerror" >&6; } -ac_res=$ac_cv_search_strerror -if test "$ac_res" != no; then : - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - -fi - ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -14782,12 +14726,12 @@ pkg_cv_USER_SHARE_CFLAGS="$USER_SHARE_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.15.2 gio-2.0 >= 2.26 gdk-x11-\$GTK_API_VERSION gtk+-\$GTK_API_VERSION dbus-1 >= 1.1.1 dbus-glib-1 libnotify >= 0.7.0 libcanberra-gtk\$CANBERRA_API_VERSION \$DBUS_MODULES \$BLUETOOTH_PKG\""; } >&5 - ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.15.2 gio-2.0 >= 2.26 gdk-x11-$GTK_API_VERSION gtk+-$GTK_API_VERSION dbus-1 >= 1.1.1 dbus-glib-1 libnotify >= 0.7.0 libcanberra-gtk$CANBERRA_API_VERSION $DBUS_MODULES $BLUETOOTH_PKG") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.15.2 gio-2.0 >= 2.26 gdk-x11-\$GTK_API_VERSION gtk+-\$GTK_API_VERSION dbus-glib-1 libnotify >= 0.7.0 libcanberra-gtk\$CANBERRA_API_VERSION \$BLUETOOTH_PKG\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.15.2 gio-2.0 >= 2.26 gdk-x11-$GTK_API_VERSION gtk+-$GTK_API_VERSION dbus-glib-1 libnotify >= 0.7.0 libcanberra-gtk$CANBERRA_API_VERSION $BLUETOOTH_PKG") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_USER_SHARE_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.15.2 gio-2.0 >= 2.26 gdk-x11-$GTK_API_VERSION gtk+-$GTK_API_VERSION dbus-1 >= 1.1.1 dbus-glib-1 libnotify >= 0.7.0 libcanberra-gtk$CANBERRA_API_VERSION $DBUS_MODULES $BLUETOOTH_PKG" 2>/dev/null` + pkg_cv_USER_SHARE_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.15.2 gio-2.0 >= 2.26 gdk-x11-$GTK_API_VERSION gtk+-$GTK_API_VERSION dbus-glib-1 libnotify >= 0.7.0 libcanberra-gtk$CANBERRA_API_VERSION $BLUETOOTH_PKG" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -14799,12 +14743,12 @@ pkg_cv_USER_SHARE_LIBS="$USER_SHARE_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.15.2 gio-2.0 >= 2.26 gdk-x11-\$GTK_API_VERSION gtk+-\$GTK_API_VERSION dbus-1 >= 1.1.1 dbus-glib-1 libnotify >= 0.7.0 libcanberra-gtk\$CANBERRA_API_VERSION \$DBUS_MODULES \$BLUETOOTH_PKG\""; } >&5 - ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.15.2 gio-2.0 >= 2.26 gdk-x11-$GTK_API_VERSION gtk+-$GTK_API_VERSION dbus-1 >= 1.1.1 dbus-glib-1 libnotify >= 0.7.0 libcanberra-gtk$CANBERRA_API_VERSION $DBUS_MODULES $BLUETOOTH_PKG") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.15.2 gio-2.0 >= 2.26 gdk-x11-\$GTK_API_VERSION gtk+-\$GTK_API_VERSION dbus-glib-1 libnotify >= 0.7.0 libcanberra-gtk\$CANBERRA_API_VERSION \$BLUETOOTH_PKG\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.15.2 gio-2.0 >= 2.26 gdk-x11-$GTK_API_VERSION gtk+-$GTK_API_VERSION dbus-glib-1 libnotify >= 0.7.0 libcanberra-gtk$CANBERRA_API_VERSION $BLUETOOTH_PKG") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_USER_SHARE_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.15.2 gio-2.0 >= 2.26 gdk-x11-$GTK_API_VERSION gtk+-$GTK_API_VERSION dbus-1 >= 1.1.1 dbus-glib-1 libnotify >= 0.7.0 libcanberra-gtk$CANBERRA_API_VERSION $DBUS_MODULES $BLUETOOTH_PKG" 2>/dev/null` + pkg_cv_USER_SHARE_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.15.2 gio-2.0 >= 2.26 gdk-x11-$GTK_API_VERSION gtk+-$GTK_API_VERSION dbus-glib-1 libnotify >= 0.7.0 libcanberra-gtk$CANBERRA_API_VERSION $BLUETOOTH_PKG" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -14825,14 +14769,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - USER_SHARE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.15.2 gio-2.0 >= 2.26 gdk-x11-$GTK_API_VERSION gtk+-$GTK_API_VERSION dbus-1 >= 1.1.1 dbus-glib-1 libnotify >= 0.7.0 libcanberra-gtk$CANBERRA_API_VERSION $DBUS_MODULES $BLUETOOTH_PKG" 2>&1` + USER_SHARE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.15.2 gio-2.0 >= 2.26 gdk-x11-$GTK_API_VERSION gtk+-$GTK_API_VERSION dbus-glib-1 libnotify >= 0.7.0 libcanberra-gtk$CANBERRA_API_VERSION $BLUETOOTH_PKG" 2>&1` else - USER_SHARE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.15.2 gio-2.0 >= 2.26 gdk-x11-$GTK_API_VERSION gtk+-$GTK_API_VERSION dbus-1 >= 1.1.1 dbus-glib-1 libnotify >= 0.7.0 libcanberra-gtk$CANBERRA_API_VERSION $DBUS_MODULES $BLUETOOTH_PKG" 2>&1` + USER_SHARE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.15.2 gio-2.0 >= 2.26 gdk-x11-$GTK_API_VERSION gtk+-$GTK_API_VERSION dbus-glib-1 libnotify >= 0.7.0 libcanberra-gtk$CANBERRA_API_VERSION $BLUETOOTH_PKG" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$USER_SHARE_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (glib-2.0 >= 2.15.2 gio-2.0 >= 2.26 gdk-x11-$GTK_API_VERSION gtk+-$GTK_API_VERSION dbus-1 >= 1.1.1 dbus-glib-1 libnotify >= 0.7.0 libcanberra-gtk$CANBERRA_API_VERSION $DBUS_MODULES $BLUETOOTH_PKG) were not met: + as_fn_error $? "Package requirements (glib-2.0 >= 2.15.2 gio-2.0 >= 2.26 gdk-x11-$GTK_API_VERSION gtk+-$GTK_API_VERSION dbus-glib-1 libnotify >= 0.7.0 libcanberra-gtk$CANBERRA_API_VERSION $BLUETOOTH_PKG) were not met: $USER_SHARE_PKG_ERRORS @@ -16866,7 +16810,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by mate-user-share $as_me 1.10.0, which was +This file was extended by mate-user-share $as_me 1.12.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16932,7 +16876,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -mate-user-share config.status 1.10.0 +mate-user-share config.status 1.12.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -18759,5 +18703,5 @@ $as_echo "$as_me: ** GTK version: $GTK_API_VERSION" >&6;} echo " -Do note Apache 2.2 and mod_dnssd 0.6 are required to use mate-user-share. +Do note Apache >= 2.2 and mod_dnssd 0.6 are required to use mate-user-share. " diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mate-user-share-1.10.0/configure.ac new/mate-user-share-1.12.0/configure.ac --- old/mate-user-share-1.10.0/configure.ac 2015-05-06 19:38:11.000000000 +0200 +++ new/mate-user-share-1.12.0/configure.ac 2015-11-05 09:26:21.000000000 +0100 @@ -1,4 +1,4 @@ -AC_INIT(mate-user-share, 1.10.0) +AC_INIT(mate-user-share, 1.12.0) AM_INIT_AUTOMAKE([1.9 dist-xz no-dist-gzip check-news]) AM_CONFIG_HEADER(config.h) @@ -14,7 +14,6 @@ YELP_HELP_INIT AC_C_CONST -AC_ISC_POSIX AC_PROG_CC AC_PROG_CPP AC_PROG_INSTALL @@ -88,7 +87,7 @@ dnl ========================================================================== -PKG_CHECK_MODULES(USER_SHARE, glib-2.0 >= 2.15.2 gio-2.0 >= 2.26 gdk-x11-$GTK_API_VERSION gtk+-$GTK_API_VERSION dbus-1 >= 1.1.1 dbus-glib-1 libnotify >= 0.7.0 libcanberra-gtk$CANBERRA_API_VERSION $DBUS_MODULES $BLUETOOTH_PKG) +PKG_CHECK_MODULES(USER_SHARE, glib-2.0 >= 2.15.2 gio-2.0 >= 2.26 gdk-x11-$GTK_API_VERSION gtk+-$GTK_API_VERSION dbus-glib-1 libnotify >= 0.7.0 libcanberra-gtk$CANBERRA_API_VERSION $BLUETOOTH_PKG) AC_SUBST(USER_SHARE_CFLAGS) AC_SUBST(USER_SHARE_LIBS) @@ -251,5 +250,5 @@ AC_MSG_NOTICE([** GTK version: $GTK_API_VERSION]) echo " -Do note Apache 2.2 and mod_dnssd 0.6 are required to use mate-user-share. +Do note Apache >= 2.2 and mod_dnssd 0.6 are required to use mate-user-share. " diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mate-user-share-1.10.0/data/Makefile.am new/mate-user-share-1.12.0/data/Makefile.am --- old/mate-user-share-1.10.0/data/Makefile.am 2015-04-06 11:02:02.000000000 +0200 +++ new/mate-user-share-1.12.0/data/Makefile.am 2015-10-09 13:15:30.000000000 +0200 @@ -10,7 +10,7 @@ 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 +app_DATA=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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mate-user-share-1.10.0/data/Makefile.in new/mate-user-share-1.12.0/data/Makefile.in --- old/mate-user-share-1.10.0/data/Makefile.in 2015-05-06 19:38:28.000000000 +0200 +++ new/mate-user-share-1.12.0/data/Makefile.in 2015-11-05 09:27:22.000000000 +0100 @@ -390,7 +390,7 @@ autostart_DATA = $(autostart_in_files:.desktop.in=.desktop) 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 +app_DATA = dav_user_2.2.conf dav_user_2.4.conf dav_groupfile file-share-properties.ui gsettings_SCHEMAS = org.mate.FileSharing.gschema.xml convertdir = $(datadir)/MateConf/gsettings convert_DATA = mate-user-share.convert diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mate-user-share-1.10.0/data/dav_user_2.0.conf new/mate-user-share-1.12.0/data/dav_user_2.0.conf --- old/mate-user-share-1.10.0/data/dav_user_2.0.conf 2014-03-07 18:01:45.000000000 +0100 +++ new/mate-user-share-1.12.0/data/dav_user_2.0.conf 1970-01-01 01:00:00.000000000 +0100 @@ -1,40 +0,0 @@ -ServerRoot ${XDG_CONFIG_HOME}/user-share -PidFile pid -LockFile lock -LogLevel crit -#LogLevel info -ErrorLog log -DAVLockDB lock - -LimitXMLRequestBody 100000 - -LoadModule dav_module /etc/httpd/modules/mod_dav.so -LoadModule dav_fs_module /etc/httpd/modules/mod_dav_fs.so -LoadModule auth_digest_module /etc/httpd/modules/mod_auth_digest.so - -DocumentRoot ${XDG_PUBLICSHARE_DIR} -<Directory "${XDG_PUBLICSHARE_DIR}"> - AllowOverride None - DAV On - - AuthType Digest - AuthName "Please log in as the user guest" - AuthDigestDomain / - AuthDigestFile ${XDG_CONFIG_HOME}/user-share/passwd - - - <IfDefine RequirePasswordAlways> - Require user guest - </IfDefine> - - <IfDefine RequirePasswordOnWrite> - <LimitExcept GET OPTIONS PROPFIND> - Require user guest - </LimitExcept> - </IfDefine> -</Directory> - -StartServers 1 -MinSpareServers 1 -MaxSpareServers 1 -MaxClients 3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mate-user-share-1.10.0/help/C/index.docbook new/mate-user-share-1.12.0/help/C/index.docbook --- old/mate-user-share-1.10.0/help/C/index.docbook 2014-03-07 18:01:45.000000000 +0100 +++ new/mate-user-share-1.12.0/help/C/index.docbook 2015-09-25 14:54:35.000000000 +0200 @@ -35,7 +35,7 @@ <releaseinfo>This manual describes version &appversion; of &app;.</releaseinfo> <legalnotice> <title>Feedback</title> - <para>To report a bug or make a suggestion regarding the &app; application or this manual, follow the directions in the <ulink url="help:user-guide?feedback-bugs" type="help">GNOME Feedback Page</ulink>.</para> + <para>To report a bug or make a suggestion regarding the &app; application or this manual, follow the directions in the <ulink url="help:mate-user-guide/feedback" type="help">MATE Feedback Page</ulink>.</para> </legalnotice> <abstract role="description"> <para>&app; is a session service that enables easy sharing of files diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mate-user-share-1.10.0/help/ca/index.docbook new/mate-user-share-1.12.0/help/ca/index.docbook --- old/mate-user-share-1.10.0/help/ca/index.docbook 2015-05-06 19:38:32.000000000 +0200 +++ new/mate-user-share-1.12.0/help/ca/index.docbook 2015-11-05 09:27:30.000000000 +0100 @@ -33,7 +33,7 @@ <releaseinfo lang="en">This manual describes version 2.26 of mate-user-share.</releaseinfo> <legalnotice> <title>Comentaris</title> - <para lang="en">To report a bug or make a suggestion regarding the mate-user-share application or this manual, follow the directions in the <ulink url="help:user-guide?feedback-bugs" type="help">GNOME Feedback Page</ulink>.</para> + <para lang="en">To report a bug or make a suggestion regarding the mate-user-share application or this manual, follow the directions in the <ulink url="help:mate-user-guide/feedback" type="help">MATE Feedback Page</ulink>.</para> </legalnotice> <abstract role="description"> <para lang="en">mate-user-share is a session service that enables easy sharing of files diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mate-user-share-1.10.0/help/cs/index.docbook new/mate-user-share-1.12.0/help/cs/index.docbook --- old/mate-user-share-1.10.0/help/cs/index.docbook 2015-05-06 19:38:32.000000000 +0200 +++ new/mate-user-share-1.12.0/help/cs/index.docbook 2015-11-05 09:27:30.000000000 +0100 @@ -33,7 +33,7 @@ <releaseinfo lang="en">This manual describes version 2.26 of mate-user-share.</releaseinfo> <legalnotice> <title>Ohlasy</title> - <para lang="en">To report a bug or make a suggestion regarding the mate-user-share application or this manual, follow the directions in the <ulink url="help:user-guide?feedback-bugs" type="help">GNOME Feedback Page</ulink>.</para> + <para lang="en">To report a bug or make a suggestion regarding the mate-user-share application or this manual, follow the directions in the <ulink url="help:mate-user-guide/feedback" type="help">MATE Feedback Page</ulink>.</para> </legalnotice> <abstract role="description"> <para lang="en">mate-user-share is a session service that enables easy sharing of files diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mate-user-share-1.10.0/help/de/index.docbook new/mate-user-share-1.12.0/help/de/index.docbook --- old/mate-user-share-1.10.0/help/de/index.docbook 2015-05-06 19:38:32.000000000 +0200 +++ new/mate-user-share-1.12.0/help/de/index.docbook 2015-11-05 09:27:30.000000000 +0100 @@ -33,7 +33,7 @@ <releaseinfo lang="en">This manual describes version 2.26 of mate-user-share.</releaseinfo> <legalnotice> <title>Rückmeldungen</title> - <para lang="en">To report a bug or make a suggestion regarding the mate-user-share application or this manual, follow the directions in the <ulink url="help:user-guide?feedback-bugs" type="help">GNOME Feedback Page</ulink>.</para> + <para lang="en">To report a bug or make a suggestion regarding the mate-user-share application or this manual, follow the directions in the <ulink url="help:mate-user-guide/feedback" type="help">MATE Feedback Page</ulink>.</para> </legalnotice> <abstract role="description"> <para lang="en">mate-user-share is a session service that enables easy sharing of files diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mate-user-share-1.10.0/help/el/index.docbook new/mate-user-share-1.12.0/help/el/index.docbook --- old/mate-user-share-1.10.0/help/el/index.docbook 2015-05-06 19:38:32.000000000 +0200 +++ new/mate-user-share-1.12.0/help/el/index.docbook 2015-11-05 09:27:30.000000000 +0100 @@ -33,7 +33,7 @@ <releaseinfo lang="en">This manual describes version 2.26 of mate-user-share.</releaseinfo> <legalnotice> <title>Ανάδραση</title> - <para lang="en">To report a bug or make a suggestion regarding the mate-user-share application or this manual, follow the directions in the <ulink url="help:user-guide?feedback-bugs" type="help">GNOME Feedback Page</ulink>.</para> + <para lang="en">To report a bug or make a suggestion regarding the mate-user-share application or this manual, follow the directions in the <ulink url="help:mate-user-guide/feedback" type="help">MATE Feedback Page</ulink>.</para> </legalnotice> <abstract role="description"> <para lang="en">mate-user-share is a session service that enables easy sharing of files diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mate-user-share-1.10.0/help/en_GB/index.docbook new/mate-user-share-1.12.0/help/en_GB/index.docbook --- old/mate-user-share-1.10.0/help/en_GB/index.docbook 2015-05-06 19:38:32.000000000 +0200 +++ new/mate-user-share-1.12.0/help/en_GB/index.docbook 2015-11-05 09:27:30.000000000 +0100 @@ -33,7 +33,7 @@ <releaseinfo lang="en">This manual describes version 2.26 of mate-user-share.</releaseinfo> <legalnotice> <title>Feedback</title> - <para lang="en">To report a bug or make a suggestion regarding the mate-user-share application or this manual, follow the directions in the <ulink url="help:user-guide?feedback-bugs" type="help">GNOME Feedback Page</ulink>.</para> + <para lang="en">To report a bug or make a suggestion regarding the mate-user-share application or this manual, follow the directions in the <ulink url="help:mate-user-guide/feedback" type="help">MATE Feedback Page</ulink>.</para> </legalnotice> <abstract role="description"> <para lang="en">mate-user-share is a session service that enables easy sharing of files diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mate-user-share-1.10.0/help/es/index.docbook new/mate-user-share-1.12.0/help/es/index.docbook --- old/mate-user-share-1.10.0/help/es/index.docbook 2015-05-06 19:38:32.000000000 +0200 +++ new/mate-user-share-1.12.0/help/es/index.docbook 2015-11-05 09:27:31.000000000 +0100 @@ -33,7 +33,7 @@ <releaseinfo lang="en">This manual describes version 2.26 of mate-user-share.</releaseinfo> <legalnotice> <title>Comentarios</title> - <para lang="en">To report a bug or make a suggestion regarding the mate-user-share application or this manual, follow the directions in the <ulink url="help:user-guide?feedback-bugs" type="help">GNOME Feedback Page</ulink>.</para> + <para lang="en">To report a bug or make a suggestion regarding the mate-user-share application or this manual, follow the directions in the <ulink url="help:mate-user-guide/feedback" type="help">MATE Feedback Page</ulink>.</para> </legalnotice> <abstract role="description"> <para lang="en">mate-user-share is a session service that enables easy sharing of files diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mate-user-share-1.10.0/help/fr/index.docbook new/mate-user-share-1.12.0/help/fr/index.docbook --- old/mate-user-share-1.10.0/help/fr/index.docbook 2015-05-06 19:38:32.000000000 +0200 +++ new/mate-user-share-1.12.0/help/fr/index.docbook 2015-11-05 09:27:31.000000000 +0100 @@ -33,7 +33,7 @@ <releaseinfo lang="en">This manual describes version 2.26 of mate-user-share.</releaseinfo> <legalnotice> <title>Votre avis</title> - <para lang="en">To report a bug or make a suggestion regarding the mate-user-share application or this manual, follow the directions in the <ulink url="help:user-guide?feedback-bugs" type="help">GNOME Feedback Page</ulink>.</para> + <para lang="en">To report a bug or make a suggestion regarding the mate-user-share application or this manual, follow the directions in the <ulink url="help:mate-user-guide/feedback" type="help">MATE Feedback Page</ulink>.</para> </legalnotice> <abstract role="description"> <para lang="en">mate-user-share is a session service that enables easy sharing of files diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mate-user-share-1.10.0/help/it/index.docbook new/mate-user-share-1.12.0/help/it/index.docbook --- old/mate-user-share-1.10.0/help/it/index.docbook 2015-05-06 19:38:32.000000000 +0200 +++ new/mate-user-share-1.12.0/help/it/index.docbook 2015-11-05 09:27:31.000000000 +0100 @@ -33,7 +33,7 @@ <releaseinfo lang="en">This manual describes version 2.26 of mate-user-share.</releaseinfo> <legalnotice> <title>Commenti</title> - <para lang="en">To report a bug or make a suggestion regarding the mate-user-share application or this manual, follow the directions in the <ulink url="help:user-guide?feedback-bugs" type="help">GNOME Feedback Page</ulink>.</para> + <para lang="en">To report a bug or make a suggestion regarding the mate-user-share application or this manual, follow the directions in the <ulink url="help:mate-user-guide/feedback" type="help">MATE Feedback Page</ulink>.</para> </legalnotice> <abstract role="description"> <para lang="en">mate-user-share is a session service that enables easy sharing of files diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mate-user-share-1.10.0/help/pt_BR/index.docbook new/mate-user-share-1.12.0/help/pt_BR/index.docbook --- old/mate-user-share-1.10.0/help/pt_BR/index.docbook 2015-05-06 19:38:32.000000000 +0200 +++ new/mate-user-share-1.12.0/help/pt_BR/index.docbook 2015-11-05 09:27:31.000000000 +0100 @@ -33,7 +33,7 @@ <releaseinfo lang="en">This manual describes version 2.26 of mate-user-share.</releaseinfo> <legalnotice> <title>Feedback</title> - <para lang="en">To report a bug or make a suggestion regarding the mate-user-share application or this manual, follow the directions in the <ulink url="help:user-guide?feedback-bugs" type="help">GNOME Feedback Page</ulink>.</para> + <para lang="en">To report a bug or make a suggestion regarding the mate-user-share application or this manual, follow the directions in the <ulink url="help:mate-user-guide/feedback" type="help">MATE Feedback Page</ulink>.</para> </legalnotice> <abstract role="description"> <para lang="en">mate-user-share is a session service that enables easy sharing of files diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mate-user-share-1.10.0/help/ro/index.docbook new/mate-user-share-1.12.0/help/ro/index.docbook --- old/mate-user-share-1.10.0/help/ro/index.docbook 2015-05-06 19:38:32.000000000 +0200 +++ new/mate-user-share-1.12.0/help/ro/index.docbook 2015-11-05 09:27:31.000000000 +0100 @@ -33,7 +33,7 @@ <releaseinfo lang="en">This manual describes version 2.26 of mate-user-share.</releaseinfo> <legalnotice> <title>Sugestii</title> - <para lang="en">To report a bug or make a suggestion regarding the mate-user-share application or this manual, follow the directions in the <ulink url="help:user-guide?feedback-bugs" type="help">GNOME Feedback Page</ulink>.</para> + <para lang="en">To report a bug or make a suggestion regarding the mate-user-share application or this manual, follow the directions in the <ulink url="help:mate-user-guide/feedback" type="help">MATE Feedback Page</ulink>.</para> </legalnotice> <abstract role="description"> <para lang="en">mate-user-share is a session service that enables easy sharing of files diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mate-user-share-1.10.0/help/sl/index.docbook new/mate-user-share-1.12.0/help/sl/index.docbook --- old/mate-user-share-1.10.0/help/sl/index.docbook 2015-05-06 19:38:32.000000000 +0200 +++ new/mate-user-share-1.12.0/help/sl/index.docbook 2015-11-05 09:27:31.000000000 +0100 @@ -33,7 +33,7 @@ <releaseinfo lang="en">This manual describes version 2.26 of mate-user-share.</releaseinfo> <legalnotice> <title lang="en">Feedback</title> - <para lang="en">To report a bug or make a suggestion regarding the mate-user-share application or this manual, follow the directions in the <ulink url="help:user-guide?feedback-bugs" type="help">GNOME Feedback Page</ulink>.</para> + <para lang="en">To report a bug or make a suggestion regarding the mate-user-share application or this manual, follow the directions in the <ulink url="help:mate-user-guide/feedback" type="help">MATE Feedback Page</ulink>.</para> </legalnotice> <abstract role="description"> <para lang="en">mate-user-share is a session service that enables easy sharing of files diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mate-user-share-1.10.0/help/sv/index.docbook new/mate-user-share-1.12.0/help/sv/index.docbook --- old/mate-user-share-1.10.0/help/sv/index.docbook 2015-05-06 19:38:32.000000000 +0200 +++ new/mate-user-share-1.12.0/help/sv/index.docbook 2015-11-05 09:27:31.000000000 +0100 @@ -33,7 +33,7 @@ <releaseinfo lang="en">This manual describes version 2.26 of mate-user-share.</releaseinfo> <legalnotice> <title>Återkoppling</title> - <para lang="en">To report a bug or make a suggestion regarding the mate-user-share application or this manual, follow the directions in the <ulink url="help:user-guide?feedback-bugs" type="help">GNOME Feedback Page</ulink>.</para> + <para lang="en">To report a bug or make a suggestion regarding the mate-user-share application or this manual, follow the directions in the <ulink url="help:mate-user-guide/feedback" type="help">MATE Feedback Page</ulink>.</para> </legalnotice> <abstract role="description"> <para lang="en">mate-user-share is a session service that enables easy sharing of files diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mate-user-share-1.10.0/help/zh_CN/index.docbook new/mate-user-share-1.12.0/help/zh_CN/index.docbook --- old/mate-user-share-1.10.0/help/zh_CN/index.docbook 2015-05-06 19:38:32.000000000 +0200 +++ new/mate-user-share-1.12.0/help/zh_CN/index.docbook 2015-11-05 09:27:31.000000000 +0100 @@ -33,7 +33,7 @@ <releaseinfo lang="en">This manual describes version 2.26 of mate-user-share.</releaseinfo> <legalnotice> <title>反馈</title> - <para lang="en">To report a bug or make a suggestion regarding the mate-user-share application or this manual, follow the directions in the <ulink url="help:user-guide?feedback-bugs" type="help">GNOME Feedback Page</ulink>.</para> + <para lang="en">To report a bug or make a suggestion regarding the mate-user-share application or this manual, follow the directions in the <ulink url="help:mate-user-guide/feedback" type="help">MATE Feedback Page</ulink>.</para> </legalnotice> <abstract role="description"> <para lang="en">mate-user-share is a session service that enables easy sharing of files diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mate-user-share-1.10.0/src/http.c new/mate-user-share-1.12.0/src/http.c --- old/mate-user-share-1.10.0/src/http.c 2015-04-06 11:02:02.000000000 +0200 +++ new/mate-user-share-1.12.0/src/http.c 2015-09-25 14:55:44.000000000 +0200 @@ -26,7 +26,6 @@ #include <glib.h> #include <glib/gi18n.h> #include <X11/Xlib.h> -#include <dbus/dbus.h> #include <gio/gio.h> @@ -54,8 +53,6 @@ #define GSETTINGS_SCHEMA "org.mate.FileSharing" -static char *dbus_session_id; - static pid_t httpd_pid = 0; static int @@ -151,41 +148,6 @@ } static void -init_dbus() { - /* The only use we make of D-BUS is to fetch the session BUS ID so we can export - * it via mDNS, so we connect and then immediately disconnect. If we were using - * the D-BUS session BUS for something persistent, the following code should use - * dbus_bus_get() and skip the shutdown. (Avahi uses the D-BUS _system_ bus - * internally.) - */ - - DBusError derror; - DBusConnection *connection; - - dbus_error_init(&derror); - - connection = dbus_bus_get_private(DBUS_BUS_SESSION, &derror); - if (connection == NULL) { - g_printerr("Failed to connect to session bus: %s", derror.message); - dbus_error_free(&derror); - return; - } - - dbus_session_id = dbus_bus_get_id(connection, &derror); - if (dbus_session_id == NULL) { - /* This can happen if the D-BUS library has been upgraded to 1.1, but the - * user's session hasn't yet been restarted - */ - g_printerr("Failed to get session BUS ID: %s", derror.message); - dbus_error_free(&derror); - } - - dbus_connection_set_exit_on_disconnect(connection, FALSE); - dbus_connection_close(connection); - dbus_connection_unref(connection); -} - -static void ensure_conf_dir (void) { char *dirname; @@ -222,7 +184,7 @@ }; static char* -get_httpd_program () +get_httpd_program (void) { int i; @@ -248,7 +210,7 @@ }; static gchar* -get_httpd_modules_path () +get_httpd_modules_path (void) { int i; @@ -464,8 +426,6 @@ gboolean http_init (void) { - init_dbus(); - return TRUE; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mate-user-share-1.10.0/src/user_share.c new/mate-user-share-1.12.0/src/user_share.c --- old/mate-user-share-1.10.0/src/user_share.c 2015-04-06 11:02:02.000000000 +0200 +++ new/mate-user-share-1.12.0/src/user_share.c 2015-10-09 13:15:30.000000000 +0200 @@ -41,8 +41,6 @@ #include "obexftp.h" #include "obexpush.h" -#include <dbus/dbus.h> -#include <dbus/dbus-glib.h> #endif /* HAVE_BLUETOOTH */ #include <gio/gio.h> @@ -63,9 +61,9 @@ #ifdef HAVE_BLUETOOTH /* 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" +#define MATE_SESSION_DBUS_NAME "org.gnome.SessionManager" +#define MATE_SESSION_DBUS_OBJECT "/org/gnome/SessionManager" +#define MATE_SESSION_DBUS_INTERFACE "org.gnome.SessionManager" static GDBusProxy *session_proxy = NULL; static gboolean has_console = TRUE;
