debian/0000775000000000000000000000000012030741470007166 5ustar debian/rules0000775000000000000000000000135012030741466010252 0ustar #!/usr/bin/make -f include /usr/share/cdbs/1/rules/autoreconf.mk include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/gnome.mk include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk LDFLAGS+=-Wl,-z,defs -Wl,-O1 -Wl,--as-needed DEB_DH_MAKESHLIBS_ARGS += --exclude=libnautilus-share-extension.so DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper \ --with-httpd=/usr/lib/apache2/mpm-worker/apache2 \ --with-modules-path=/usr/lib/apache2/modules/ install/gnome-user-share:: rm -f debian/gnome-user-share/usr/share/gnome-user-share/dav_user_2.0.conf find debian/gnome-user-share -name "*.la" -delete rm -rf debian/gnome-user-share/usr/lib/nautilus debian/watch0000664000000000000000000000017312030741466010225 0ustar version=3 http://ftp.gnome.org/pub/gnome/sources/gnome-user-share/([\d\.]+[02468])/ \ gnome-user-share-([\d\.]+)\.tar\.xz debian/gconf-defaults0000664000000000000000000000006212030741466012015 0ustar /desktop/gnome/file_sharing/bluetooth_notify true debian/control.in0000664000000000000000000000262612030741466011211 0ustar Source: gnome-user-share Section: gnome Priority: optional Maintainer: Ubuntu Desktop Team XSBC-Original-Maintainer: Debian GNOME Maintainers Uploaders: @GNOME_TEAM@ Build-Depends: cdbs, debhelper (>= 8), dh-autoreconf, gnome-pkg-tools, intltool (>= 0.35.0), yelp-tools, libxt-dev, pkg-config, libdbus-1-dev (>= 1.1.1), libglib2.0-dev (>= 2.15.2), libgtk-3-dev, libdbus-glib-1-dev, libnotify-dev (>= 0.7), libcanberra-gtk3-dev, libselinux1-dev [linux-any], libgnome-bluetooth-dev (>= 2.91.5) [linux-any], libnautilus-extension-dev (>= 2.91.7) Standards-Version: 3.9.3 Vcs-Bzr: http://code.launchpad.net/~ubuntu-desktop/gnome-user-share/ubuntu Package: gnome-user-share Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, obex-data-server [linux-any], gnome-bluetooth [linux-any] Suggests: apache2.2-bin, libapache2-mod-dnssd (>= 0.6) Description: User level public file sharing via WebDAV or ObexFTP gnome-user-share is a small package that allows easy user-level file sharing via WebDAV or ObexFTP. The shared files are announced on the network by Avahi. debian/changelog0000664000000000000000000004002312030741466011044 0ustar gnome-user-share (3.0.4-0ubuntu1) quantal; urgency=low * New upstream bugfix release * debian/control: - Use standards-version 3.9.3 -- Robert Ancell Thu, 27 Sep 2012 15:08:33 +1200 gnome-user-share (3.0.3-0ubuntu1) quantal; urgency=low * New upstream release * debian/control: - Drop build-depends on libgconf2-dev - Change build-depends from gnome-doc-utils to yelp-tools -- Robert Ancell Sat, 25 Aug 2012 16:59:00 +1200 gnome-user-share (3.0.2-0ubuntu3) quantal; urgency=low * Rebuild with the new libgnome-bluetooth -- Sebastien Bacher Fri, 10 Aug 2012 11:37:30 +0200 gnome-user-share (3.0.2-0ubuntu2) quantal; urgency=low * No-change rebuild against gnome-bluetooth 3.4 -- Jeremy Bicha Wed, 16 May 2012 01:10:31 -0400 gnome-user-share (3.0.2-0ubuntu1) precise; urgency=low * New upstream version: - Port from libunique to GtkApplication * debian/control.in: - drop the libunique requirement -- Sebastien Bacher Thu, 22 Mar 2012 13:42:15 +0100 gnome-user-share (3.0.1-1ubuntu1) precise; urgency=low * debian/patches/08_fix_port_discovery.patch: - dropped, the fix is in the new version * Resynchronize on Debian, remaining diffs: * debian/control: - don't Build-depend on scrollkeeper. - Suggests the apache2.2-bin and libapache2-mod-dnssd binaries rather than depends on those, we want obex push to work out of the box but we don't really need webdav and the apache binaries on the default installation. * debian/dirs: Dropped, we don't need to create /usr/share/gnome. * debian/gconf-defaults: Enable notifications on receipt of files by default * debian/patches/01_notification.patch: Display an alert box instead of a notification for files received. * debian/patches/02_bluetooth_optional.patch: Dropped, it's enables Bluetooth support to be configurable at build-time. We don't actually use it, it adds a lot of #ifdef's to the code, and requires some effort to port it to the new version. * debian/patches/04_webdav_optional.patch: - De-senstize the WebDAV UI components if the suggested packages are not available for WebDAV sharing. Display a notice explaining why sharing cannot be enabled. * debian/patches/05_autostart_delay.patch: - set X-GNOME-Autostart-Delay key to delay starting by 15 seconds. * debian/patches/06_nodisplay_autostart.patch: - Don't show in "Startup Applications" * debian/patches/07_onlyshowin_unity.patch: - Add Unity to OnlyShowIn * debian/rules: - don't move autostart file from etc to usr - don't install the Nautilus bar. It's not that useful to people who don't have bluetooth hardware and is not easily disabled. - use --disable-scrollkeeper -- Sebastien Bacher Tue, 22 Nov 2011 16:37:46 +0100 gnome-user-share (3.0.1-1) unstable; urgency=low * New upstream release. * debian/watch: - Track .xz tarballs. * debian/control.in: - Set pkg-gnome-maintainers@lists.alioth.debian.org as Maintainer. -- Michael Biebl Wed, 19 Oct 2011 01:40:40 +0200 gnome-user-share (3.0.0-3) unstable; urgency=low [ Martin Pitt ] * debian/control.in: Add Vcs-* fields. [ Michael Biebl ] * Upload to unstable. * Bump debhelper compatibility level to 8. -- Michael Biebl Thu, 13 Oct 2011 21:23:09 +0200 gnome-user-share (3.0.0-2) experimental; urgency=low * Require libnotify 0.7. -- Josselin Mouette Wed, 01 Jun 2011 14:26:00 +0200 gnome-user-share (3.0.0-1) experimental; urgency=low * New upstream release. * Switch to 3.0 quilt format. * Use dh-autoreconf. * Drop 90_relibtoolize.patch accordingly. * 02_bluetooth_optional.patch: updated for the new version. * Update build dependencies. * preinst: dropped, the fixed version is in stable. -- Josselin Mouette Tue, 31 May 2011 23:21:38 +0200 gnome-user-share (2.30.2-1) unstable; urgency=low * New upstream release. - Don't use deprecated libnotify API. Closes: #630278 * Bump Build-Depends on libnotify-dev to (>= 0.7.0). * Use dh-autoreconf to update the build system. - Drop debian/patches/90_relibtoolize.patch. - Add Build-Depends on dh-autoreconf. - Add autoreconf.mk include to debian/rules. * Switch to dpkg source format 3.0 (quilt). - Drop Build-Depends on quilt. - Add debian/source/format. - Remove patchsys-quilt.mk include from debian/rules. * Bump Standards-Version to 3.9.2. No further changes. * debian/watch: Track .bz2 tarballs. -- Michael Biebl Tue, 02 Aug 2011 07:29:53 +0200 gnome-user-share (2.30.1-1) unstable; urgency=low * Drop type-handling usage. Closes: #587876. * Bump standards version accordingly. * New upstream translation and bugfix release. * 03_NAUTILUS_IS_USER_SHARE.patch: dropped, merged upstream. * 90_relibtoolize.patch: regenerated. -- Josselin Mouette Wed, 20 Oct 2010 00:06:37 +0200 gnome-user-share (2.30.0-1) unstable; urgency=low [ Emilio Pozuelo Monfort ] * debian/watch: - Only track stable releases. [ Luca Falavigna ] * New upstream release. * Refresh patches for new upstream release: - 02_bluetooth_optional.patch - 90_relibtoolize.patch * debian/patches/03_makefile_error.patch: - Removed, fixed upstream. * debian/patches/03_NAUTILUS_IS_USER_SHARE.patch: - Fix use of undefined macro NAUTILUS_IS_SHARE. * debian/control.in: - Build-depend on libnautilus-extension-dev. - Bump Standards-Version to 3.8.4, no changes required. * debian/rules: - Do not consider libnautilus-share-extension a shared library. -- Luca Falavigna Sun, 04 Apr 2010 18:48:44 +0200 gnome-user-share (2.28.2-4) unstable; urgency=low * debian/patches/02_bluetooth_optional.patch: - Re-add HAVE_BLUETOOTH macro, erroneously removed (Closes: #563614). * debian/patches/90_relibtoolize.patch: - Regenerate to pick the above change. -- Luca Falavigna Mon, 18 Jan 2010 00:33:29 +0100 gnome-user-share (2.28.2-3) unstable; urgency=low * debian/control.in: - adding back obex-data-server depends since g-u-s actually needs it and not obexd-server itself. (there's no GNOME package using obexd-server at the moment) -- Andrea Veri Fri, 15 Jan 2010 14:40:50 +0100 gnome-user-share (2.28.2-2) unstable; urgency=low * debian/patches/90_relibtoolize.patch: - Regenerate it from scratch, previous attempt was unsuccessful and caused build failures on some ports. -- Luca Falavigna Wed, 23 Dec 2009 00:10:27 +0100 gnome-user-share (2.28.2-1) unstable; urgency=low [ Josselin Mouette ] * Depend on obexd-server, not obex-data-server. [ Luca Falavigna ] * New upstream bugfix release. * Refresh patches for new upstream release. * debian/control: - Add libunique-dev to Build-Depends. -- Luca Falavigna Tue, 22 Dec 2009 21:18:06 +0000 gnome-user-share (2.28.1-3) unstable; urgency=low * Oops, it’s not+linux-gnu, not not+linux. -- Josselin Mouette Sat, 14 Nov 2009 14:47:38 +0100 gnome-user-share (2.28.1-2) unstable; urgency=low * Switch to quilt to manage patches. * 02_bluetooth_optional.patch: new patch. Make bluetooth support optional so that it can build on kFreeBSD. * Only require bluetooth stuff on Linux architectures. * 03_makefile_error.patch: new patch. Fix error in Makefile.am leading to automake being unable to run. * 90_relibtoolize.patch: re-run the autotools on top of that. -- Josselin Mouette Sat, 14 Nov 2009 13:32:09 +0100 gnome-user-share (2.28.1-1) unstable; urgency=low * New upstream bugfix release. * debian/control.in: - Build-depend on libcanberra-gtk. -- Luca Falavigna Sun, 01 Nov 2009 14:58:58 +0100 gnome-user-share (2.28.0-1) unstable; urgency=low [ Andrea Veri ] * New upstream release. * debian/control.in: - bumped standards-version to latest 3.8.3. No changes needed. - added a B-D on libgnome-bluetooth-dev as per configure.in requirements. * debian/copyright: - added missing copyright holders. [ Luca Falavigna ] * debian/copyright: - Point to versioned GPL license in common-licenses. -- Luca Falavigna Sat, 10 Oct 2009 12:53:35 +0200 gnome-user-share (2.26.0-2) unstable; urgency=low * Build-depend on scrollkeeper. Closes: #536318. -- Josselin Mouette Sat, 11 Jul 2009 11:27:45 +0200 gnome-user-share (2.26.0-1) unstable; urgency=low [ Loic Minier ] * Don't rm_conffile /etc/xdg/autostart/gnome-user-share-session.desktop during first installation. [ Josselin Mouette ] * Wrap build-depends and depends. * New upstream release. Closes: #530761. * 01_apache-config.patch: updated for the new version, removed obsolete chunk. * Only depend on apache2.2-bin. Kudos to the Apache maintainers for making this possible. * Explicitly use the path to the worker variant of Apache. * Require the package that contains mod_dnssd. * Depend on gnome-bluetooth instead of bluez-gnome. * Require obex-data-server 0.4 for the new API. * Move autostart file to /usr/share/gnome/autostart. * preinst: remove the conffile accordingly. -- Josselin Mouette Sat, 27 Jun 2009 11:12:12 +0200 gnome-user-share (0.31-3) unstable; urgency=medium * debian/preinst: + Remove obsolete conffile. * debian/01_apache-config.patch: + Fix apache config even more. -- Sebastian Dröge Fri, 18 Apr 2008 12:42:37 +0200 gnome-user-share (0.31-2) unstable; urgency=low * debian/patches/01_apache-config.patch, debian/rules: + Fix the apache config and don't ship a config for apache 2.0, we only support 2.2. -- Sebastian Dröge Thu, 10 Apr 2008 08:43:56 +0200 gnome-user-share (0.31-1) unstable; urgency=low * New upstream release. -- Sebastian Dröge Mon, 07 Apr 2008 12:23:18 +0200 gnome-user-share (0.30-1) unstable; urgency=low * New upstream release: + debian/control.in: - Depend on obex-data-server and bluez-gnome for ObexFTP file sharing. - Update description. + debian/copyright: - Add Bastien as second upstream author. + debian/control.in: - Remove glade from build dependencies. + debian/patches/01_debianise-dav-user-conf.diff, debian/rules: - Use the new configure parameter now instead of patching. + debian/patches/02_README.diff: - Dropped, this is fixed upstream now. -- Sebastian Dröge Tue, 18 Mar 2008 02:17:30 +0100 gnome-user-share (0.21-1) unstable; urgency=low * New upstream release: + debian/gnome-user-share-session.*, debian/rules: - Don't build our own starter, upstream provides one now. + debian/control.in: - Update build dependencies. - Update Standards-Version to 3.7.3, no additional changes needed. -- Sebastian Dröge Fri, 14 Mar 2008 14:35:18 +0100 gnome-user-share (0.11-3) unstable; urgency=low * debian/control: + Update to Standards-Version 3.7.3, no additional changes needed. * debian/rules: + Use LDFLAGS for linking the gnome-user-share-session helper too. -- Sebastian Dröge Sun, 06 Jan 2008 19:52:14 +0100 gnome-user-share (0.11-2) unstable; urgency=low * Upload to unstable -- Sebastian Dröge Mon, 16 Apr 2007 01:43:08 +0200 gnome-user-share (0.11-1) experimental; urgency=low * New upstream release * debian/rules, debian/control: + Use gnome-pkg-tools to add the Gnome team to Uploaders + Add get-orig-source target * debian/patches/01_debianise-dav-user-conf.diff: + Updated for new upstream version -- Sebastian Dröge Tue, 6 Mar 2007 18:36:22 +0100 gnome-user-share (0.10-4) unstable; urgency=medium * Urgency medium because of RC bugfix. This should go to etch. * debian/patches/01_debianise-dav-user-conf.diff: + Also load the mime module to allow usage of the TypesConfig directive (Closes: #411171) -- Sebastian Dröge Sun, 18 Feb 2007 11:10:21 +0100 gnome-user-share (0.10-3) unstable; urgency=low * debian/control: + Only build-depend on libselinux-dev on Linux platforms (Closes: #402135) + Updated to use my debian.org mail address -- Sebastian Dröge Mon, 8 Jan 2007 08:27:54 +0100 gnome-user-share (0.10-2) unstable; urgency=low * Acknowledge NMU (Closes: #391259) * debian/control, debian/rules: + Add versioned apache2 dependency back but require apache 2.2 * debian/control: + Update Standards-Version to 3.7.2 -- Sebastian Dröge Tue, 17 Oct 2006 17:59:26 +0200 gnome-user-share (0.10-1.1) unstable; urgency=medium * Non-maintainer upload. * Don't use a versioned dependency on apache2 (Closes: #391259). -- Luk Claes Sun, 15 Oct 2006 18:16:58 +0200 gnome-user-share (0.10-1) unstable; urgency=low * New upstream release * debian/patches/01_debianise-dav-user-conf.diff: + Update for the new filenames and patch the apache 2.0 and 2.2 configs * Depend on apache2 (>= 2.0) and (<< 2.1). We need to rebuild when apache 2.2 gets into Debian to get the correct config file link for apache created. -- Sebastian Dröge Wed, 19 Apr 2006 15:10:13 +0200 gnome-user-share (0.9-4) unstable; urgency=low * Add a autostart .desktop file and a small loader that loads gnome-user-share when it was enabled in the capplet. This way gnome-user-share is started again with the session when it was enabled before. -- Sebastian Dröge Sun, 2 Apr 2006 13:55:20 +0200 gnome-user-share (0.9-3) unstable; urgency=low * Added debian/watch * Added README to the package and patch it to include informations about avahi and improve the language a bit (02_README.diff) (Closes: #353180) * Updated to debhelper compat version 5 -- Sebastian Dröge Thu, 23 Feb 2006 19:51:20 +0100 gnome-user-share (0.9-2) unstable; urgency=low * Upload to unstable * Add libxt-dev to Build-Depends to fix the failed configure check for X * Use --as-needed to get rid of unneeded dependencies -- Sebastian Dröge Tue, 17 Jan 2006 23:00:03 +0100 gnome-user-share (0.9-1) experimental; urgency=low * New upstream release * Adjusted Build-Depends for avahi 0.6 * Upload to Debian (Closes: #283088) -- Sebastian Dröge Wed, 21 Dec 2005 19:18:04 +0100 gnome-user-share (0.8-1) unstable; urgency=low * New upstream release -- Sebastian Dröge Tue, 15 Nov 2005 23:23:48 +0100 gnome-user-share (0.7-0ubuntu2) dapper; urgency=low * Add new FSF address to the copyright file -- Sebastian Dröge Thu, 10 Nov 2005 07:08:06 +0100 gnome-user-share (0.7-0ubuntu1) dapper; urgency=low * New upstream release * Use avahi instead of howl and added Build-Depends for it * Made Build-Depends stricter -- Sebastian Dröge Wed, 9 Nov 2005 12:02:33 +0100 gnome-user-share (0.4-1) hoary; urgency=low * New upstream release -- Jeff Waugh Sat, 4 Dec 2004 00:05:19 +1100 gnome-user-share (0.3-3) hoary; urgency=low * debian/control: - Build-Depend on libxt-dev, because autoconf looks for Xt to determine if X is installed. * debian/patches/01_debianise-dav-user-conf.diff: - Only define Max/MinSpareServers and MaxClients when using prefork. -- Jeff Waugh Sat, 27 Nov 2004 01:48:26 +1100 gnome-user-share (0.3-2) hoary; urgency=low * Build-Depend on libx11-dev, libice-dev, libsm-dev -- Jeff Waugh Sat, 27 Nov 2004 00:06:14 +1100 gnome-user-share (0.3-1) hoary; urgency=low * Initial Release -- Jeff Waugh Tue, 01 Jun 2004 16:14:59 +1000 debian/control0000664000000000000000000000334312030741470010574 0ustar # This file is autogenerated. DO NOT EDIT! # # Modifications should be made to debian/control.in instead. # This file is regenerated automatically in the clean target. Source: gnome-user-share Section: gnome Priority: optional Maintainer: Ubuntu Desktop Team XSBC-Original-Maintainer: Debian GNOME Maintainers Uploaders: Debian GNOME Maintainers , Jeremy Bicha , Josselin Mouette , Michael Biebl Build-Depends: cdbs, debhelper (>= 8), dh-autoreconf, gnome-pkg-tools, intltool (>= 0.35.0), yelp-tools, libxt-dev, pkg-config, libdbus-1-dev (>= 1.1.1), libglib2.0-dev (>= 2.15.2), libgtk-3-dev, libdbus-glib-1-dev, libnotify-dev (>= 0.7), libcanberra-gtk3-dev, libselinux1-dev [linux-any], libgnome-bluetooth-dev (>= 2.91.5) [linux-any], libnautilus-extension-dev (>= 2.91.7) Standards-Version: 3.9.3 Vcs-Bzr: http://code.launchpad.net/~ubuntu-desktop/gnome-user-share/ubuntu Package: gnome-user-share Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, obex-data-server [linux-any], gnome-bluetooth [linux-any] Suggests: apache2.2-bin, libapache2-mod-dnssd (>= 0.6) Description: User level public file sharing via WebDAV or ObexFTP gnome-user-share is a small package that allows easy user-level file sharing via WebDAV or ObexFTP. The shared files are announced on the network by Avahi. debian/source/0000775000000000000000000000000012030741466010473 5ustar debian/source/format0000664000000000000000000000001412030741466011701 0ustar 3.0 (quilt) debian/compat0000664000000000000000000000000212030741466010371 0ustar 8 debian/patches/0000775000000000000000000000000012030741466010622 5ustar debian/patches/07_onlyshowin_unity.patch0000664000000000000000000000243112030741466015612 0ustar Description: Show in Unity as well as GNOME Author: Michael Terry Bug-Ubuntu: https://launchpad.net/bugs/803519 Bug: https://bugzilla.gnome.org/show_bug.cgi?id=653811 Index: gnome-user-share-3.0.0/data/gnome-user-share-properties.desktop.in =================================================================== --- gnome-user-share-3.0.0.orig/data/gnome-user-share-properties.desktop.in 2011-07-01 12:22:32.833805737 +0100 +++ gnome-user-share-3.0.0/data/gnome-user-share-properties.desktop.in 2011-07-01 12:22:42.525805840 +0100 @@ -7,7 +7,7 @@ Terminal=false Type=Application Categories=GNOME;Settings;X-GNOME-NetworkSettings; -OnlyShowIn=GNOME; +OnlyShowIn=GNOME;Unity; X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=gnome-user-share X-GNOME-Bugzilla-Component=general Index: gnome-user-share-3.0.0/data/gnome-user-share.desktop.in.in =================================================================== --- gnome-user-share-3.0.0.orig/data/gnome-user-share.desktop.in.in 2011-07-01 12:22:32.801805737 +0100 +++ gnome-user-share-3.0.0/data/gnome-user-share.desktop.in.in 2011-07-01 12:22:38.413805796 +0100 @@ -6,6 +6,6 @@ Terminal=false Type=Application Categories= -OnlyShowIn=GNOME; +OnlyShowIn=GNOME;Unity; X-GNOME-Autostart-Delay=15 NoDisplay=true debian/patches/series0000664000000000000000000000022612030741466012037 0ustar 01_apache-config.patch 01_notification.patch 04_webdav_optional.patch 05_autostart_delay.patch 06_nodisplay_autostart.patch 07_onlyshowin_unity.patch debian/patches/06_nodisplay_autostart.patch0000664000000000000000000000115712030741466016264 0ustar Description: Clean up Startup Applications dialog by hiding default apps Author: Michael Terry Bug-Ubuntu: https://launchpad.net/bugs/803917 Forwarded: not-needed Index: gnome-user-share-3.0.0/data/gnome-user-share.desktop.in.in =================================================================== --- gnome-user-share-3.0.0.orig/data/gnome-user-share.desktop.in.in 2011-07-01 11:32:13.353773779 +0100 +++ gnome-user-share-3.0.0/data/gnome-user-share.desktop.in.in 2011-07-01 11:32:35.057774009 +0100 @@ -8,3 +8,4 @@ Categories= OnlyShowIn=GNOME; X-GNOME-Autostart-Delay=15 +NoDisplay=true debian/patches/01_notification.patch0000664000000000000000000001774712030741466014651 0ustar From: Ken VanDine Description: Display an alert box instead of a notification for files received. Bug: http://bugzilla.gnome.org/578226 Bug-Ubuntu: https://launchpad.net/bugs/337352 Forwarded: yes Author: Cody Russell Index: gnome-user-share-3.0.3/src/obexpush.c =================================================================== --- gnome-user-share-3.0.3.orig/src/obexpush.c 2012-08-25 16:55:36.957073935 +1200 +++ gnome-user-share-3.0.3/src/obexpush.c 2012-08-25 16:55:50.441073805 +1200 @@ -67,15 +67,36 @@ } static void -notification_launch_action_on_file_cb (NotifyNotification *notification, - const char *action, - const char *file_uri) +launch_file_viewer (const gchar *file_uri) { - GdkDisplay *display; - GAppLaunchContext *ctx; + GdkAppLaunchContext *ctx = NULL; GTimeVal val; - g_assert (action != NULL); + g_get_current_time (&val); + + ctx = gdk_app_launch_context_new (); + gdk_app_launch_context_set_screen (ctx, gdk_screen_get_default ()); + gdk_app_launch_context_set_timestamp (ctx, val.tv_sec); + + if (!g_app_info_launch_default_for_uri (file_uri, + G_APP_LAUNCH_CONTEXT (ctx), + NULL)) { + g_warning ("Failed to launch the file viewer\n"); + } + + if (ctx) + g_object_unref (ctx); +} + +static void +open_download_folder (const gchar *file_uri) +{ + GdkDisplay *display; + GdkAppLaunchContext *ctx = NULL; + GTimeVal val; + GFile *file; + GFile *parent; + gchar *parent_uri; g_get_current_time (&val); @@ -83,30 +104,39 @@ ctx = G_APP_LAUNCH_CONTEXT (gdk_display_get_app_launch_context (display)); gdk_app_launch_context_set_timestamp (GDK_APP_LAUNCH_CONTEXT (ctx), val.tv_sec); + file = g_file_new_for_uri (file_uri); + parent = g_file_get_parent (file); + parent_uri = g_file_get_uri (parent); + + g_object_unref (file); + g_object_unref (parent); + + if (!g_app_info_launch_default_for_uri (parent_uri, + G_APP_LAUNCH_CONTEXT (ctx), + NULL)) { + g_warning ("Failed to launch the file manager\n"); + } + + g_free (parent_uri); + if (ctx) + g_object_unref (ctx); +} + +static void +notification_launch_action_on_file_cb (NotifyNotification *notification, + const char *action, + const char *file_uri) +{ + g_assert (action != NULL); + /* We launch the file viewer for the file */ if (g_str_equal (action, "display") != FALSE) { - if (g_app_info_launch_default_for_uri (file_uri, ctx, NULL) == FALSE) { - g_warning ("Failed to launch the file viewer\n"); - } + launch_file_viewer (file_uri); } /* we open the Downloads folder */ if (g_str_equal (action, "reveal") != FALSE) { - GFile *file; - GFile *parent; - gchar *parent_uri; - - file = g_file_new_for_uri (file_uri); - parent = g_file_get_parent (file); - parent_uri = g_file_get_uri (parent); - g_object_unref (file); - g_object_unref (parent); - - if (!g_app_info_launch_default_for_uri (parent_uri, ctx, NULL)) { - g_warning ("Failed to launch the file manager\n"); - } - - g_free (parent_uri); + open_download_folder (file_uri); } notify_notification_close (notification, NULL); @@ -115,12 +145,73 @@ } static void +on_dialog_response (GtkDialog *dialog, + gint response_id, + gpointer user_data) +{ + char *file_uri = (char *)user_data; + + switch (response_id) { + case GTK_RESPONSE_YES: + /* "Open" */ + launch_file_viewer (file_uri); + break; + case GTK_RESPONSE_APPLY: + /* "Reveal" */ + open_download_folder (file_uri); + break; + case GTK_RESPONSE_OK: + case GTK_RESPONSE_DELETE_EVENT: + /* "OK" dismisses the alert box without further action. */ + break; + default: + g_assert_not_reached (); + break; + } + + g_free (file_uri); + gtk_widget_destroy (GTK_WIDGET (dialog)); + hide_statusicon (); +} + +static gboolean +supports_actions (void) +{ + static gboolean supports_actions = FALSE; + static gboolean have_checked = FALSE; + + if (!have_checked) { + GList *caps = NULL; + GList *c; + + have_checked = TRUE; + + caps = notify_get_server_caps (); + if (caps != NULL) { + for (c = caps; c != NULL; c = c->next) { + if (strcmp ((char*)c->data, "actions") == 0) { + supports_actions = TRUE; + break; + } + } + + g_list_foreach (caps, (GFunc) g_free, NULL); + g_list_free (caps); + } + } + + return supports_actions; +} + +static void show_notification (const char *filename) { char *file_uri, *notification_text, *display, *mime_type; NotifyNotification *notification; ca_context *ctx; GAppInfo *app; + GtkWidget *dialog; + GtkWidget *image; file_uri = g_filename_to_uri (filename, NULL, NULL); if (file_uri == NULL) { @@ -128,36 +219,65 @@ return; } - display = g_filename_display_basename (filename); - /* Translators: %s is the name of the filename received */ - notification_text = g_strdup_printf(_("You received \"%s\" via Bluetooth"), display); - g_free (display); - notification = notify_notification_new (_("You received a file"), - notification_text, - "dialog-information"); - - notify_notification_set_timeout (notification, NOTIFY_EXPIRES_DEFAULT); - mime_type = g_content_type_guess (filename, NULL, 0, NULL); app = g_app_info_get_default_for_type (mime_type, FALSE); - if (app != NULL) { - g_object_unref (app); - notify_notification_add_action (notification, "display", _("Open File"), + g_free (mime_type); + + display = g_filename_display_basename (filename); + + if (supports_actions ()) { + /* Translators: %s is the name of the filename received */ + notification_text = g_strdup_printf(_("You received \"%s\" via Bluetooth"), display); + notification = notify_notification_new (_("You received a file"), + notification_text, + "dialog-information"); + + notify_notification_set_timeout (notification, NOTIFY_EXPIRES_DEFAULT); + + if (app != NULL) { + notify_notification_add_action (notification, "display", _("Open File"), + (NotifyActionCallback) notification_launch_action_on_file_cb, + g_strdup (file_uri), (GFreeFunc) g_free); + } + notify_notification_add_action (notification, "reveal", _("Reveal File"), (NotifyActionCallback) notification_launch_action_on_file_cb, g_strdup (file_uri), (GFreeFunc) g_free); - } - notify_notification_add_action (notification, "reveal", _("Reveal File"), - (NotifyActionCallback) notification_launch_action_on_file_cb, - g_strdup (file_uri), (GFreeFunc) g_free); - g_free (file_uri); - - g_signal_connect (G_OBJECT (notification), "closed", G_CALLBACK (on_close_notification), notification); + g_signal_connect (G_OBJECT (notification), "closed", G_CALLBACK (on_close_notification), notification); + + if (!notify_notification_show (notification, NULL)) { + g_warning ("failed to send notification\n"); + } + g_free (notification_text); + } else { + dialog = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_OTHER, GTK_BUTTONS_NONE, + _("You have received the file “%s” over Bluetooth."), display, + NULL); + gtk_window_set_focus_on_map (GTK_WINDOW (dialog), FALSE); + gtk_window_set_icon_name (GTK_WINDOW (dialog), "gnome-obex-server"); + if (app != NULL) { + image = gtk_image_new_from_gicon (g_app_info_get_icon (app), GTK_ICON_SIZE_DIALOG); + gtk_message_dialog_set_image (GTK_MESSAGE_DIALOG (dialog), image); + } + gtk_window_set_title (GTK_WINDOW (dialog), _("File Received")); + if (app != NULL) { + gtk_dialog_add_button (GTK_DIALOG (dialog), + _("Open"), GTK_RESPONSE_YES); + } + gtk_dialog_add_buttons (GTK_DIALOG (dialog), + _("Reveal"), GTK_RESPONSE_APPLY, + _("OK"), GTK_RESPONSE_OK, + NULL); + gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK); + g_signal_connect (G_OBJECT (dialog), "response", G_CALLBACK (on_dialog_response), g_strdup (file_uri)); - if (!notify_notification_show (notification, NULL)) { - g_warning ("failed to send notification\n"); + gtk_widget_show_all (dialog); } - g_free (notification_text); + + if (app != NULL) + g_object_unref (app); + g_free (file_uri); + g_free (display); /* Now we do the audio notification */ ctx = ca_gtk_context_get (); debian/patches/01_apache-config.patch0000664000000000000000000000111512030741466014625 0ustar --- a/data/dav_user_2.2.conf.orig 2009-06-27 10:28:32.044136148 +0200 +++ b/data/dav_user_2.2.conf 2009-06-27 10:30:11.067899425 +0200 @@ -14,11 +14,14 @@ LoadModule auth_digest_module ${HTTP_MODULES_PATH}/mod_auth_digest.so LoadModule authz_groupfile_module ${HTTP_MODULES_PATH}/mod_authz_groupfile.so LoadModule dnssd_module ${HTTP_MODULES_PATH}/mod_dnssd.so +LoadModule mime_module ${HTTP_MODULES_PATH}/mod_mime.so DNSSDEnable on DNSSDAutoRegisterVHosts Off DNSSDAutoRegisterUserDir Off +TypesConfig /etc/mime.types + DocumentRoot ${XDG_PUBLICSHARE_DIR} debian/patches/05_autostart_delay.patch0000664000000000000000000000110212030741466015345 0ustar From: Chris Coulson Description: Add X-GNOME-Autostart-Delay key to autostart file to delay starting by 15 seconds. Index: gnome-user-share-2.28.2/data/gnome-user-share.desktop.in.in =================================================================== --- gnome-user-share-2.28.2.orig/data/gnome-user-share.desktop.in.in 2010-02-18 00:55:06.700536092 +0000 +++ gnome-user-share-2.28.2/data/gnome-user-share.desktop.in.in 2010-02-18 00:55:53.930513505 +0000 @@ -7,3 +7,4 @@ Type=Application Categories= OnlyShowIn=GNOME; +X-GNOME-Autostart-Delay=15 debian/patches/04_webdav_optional.patch0000664000000000000000000002442012030741466015325 0ustar From: Chris Coulson Description: - Ensure the WebDAV sharing toggle button clears if Apache could not be started. - De-senstize the WebDAV UI components if the suggested packages are not available for WebDAV sharing. Display a notice explaining why sharing cannot be enabled. This is a stop-gap measure until add a button in the UI for installing the required components via AptDaemon. Index: gnome-user-share-3.0.3/src/user_share-private.c =================================================================== --- gnome-user-share-3.0.3.orig/src/user_share-private.c 2011-10-18 02:38:06.000000000 +1300 +++ gnome-user-share-3.0.3/src/user_share-private.c 2012-08-25 16:54:53.053074352 +1200 @@ -25,6 +25,7 @@ #include "config.h" #include +#include #include "user_share-private.h" @@ -101,4 +102,29 @@ return ACCEPT_BONDED; } +static const char *known_httpd_locations [] = { + HTTPD_PROGRAM, + "/usr/sbin/httpd", + "/usr/sbin/httpd2", + "/usr/sbin/apache2", + NULL +}; + +char* +get_httpd_program () +{ + int i; + for (i = 0; known_httpd_locations[i]; i++) { + if (known_httpd_locations[i][0] == '\0') { + /* empty string as first element, happens when + * configured --with-httpd=auto */ + continue; + } + if (g_file_test (known_httpd_locations[i], G_FILE_TEST_IS_EXECUTABLE) + && ! g_file_test (known_httpd_locations[i], G_FILE_TEST_IS_DIR)) { + return g_strdup (known_httpd_locations[i]); + } + } + return NULL; +} Index: gnome-user-share-3.0.3/src/user_share-private.h =================================================================== --- gnome-user-share-3.0.3.orig/src/user_share-private.h 2012-08-25 03:25:59.000000000 +1200 +++ gnome-user-share-3.0.3/src/user_share-private.h 2012-08-25 16:54:53.053074352 +1200 @@ -55,4 +55,6 @@ const char *accept_string_from_setting (AcceptSetting setting); AcceptSetting accept_setting_from_string (const char *str); +char *get_httpd_program (void); + #endif /* _USER_SHARE_PRIVATE_H_ */ Index: gnome-user-share-3.0.3/src/http.c =================================================================== --- gnome-user-share-3.0.3.orig/src/http.c 2012-08-25 03:25:59.000000000 +1200 +++ gnome-user-share-3.0.3/src/http.c 2012-08-25 16:54:53.053074352 +1200 @@ -216,33 +216,6 @@ #endif } -static const char *known_httpd_locations [] = { - HTTPD_PROGRAM, - "/usr/sbin/httpd", - "/usr/sbin/httpd2", - "/usr/sbin/apache2", - NULL -}; - -static char* -get_httpd_program () -{ - int i; - - for (i = 0; known_httpd_locations[i]; i++) { - if (known_httpd_locations[i][0] == '\0') { - /* empty string as first element, happens when - * configured --with-httpd=auto */ - continue; - } - if (g_file_test (known_httpd_locations[i], G_FILE_TEST_IS_EXECUTABLE) - && ! g_file_test (known_httpd_locations[i], G_FILE_TEST_IS_DIR)) { - return g_strdup (known_httpd_locations[i]); - } - } - return NULL; -} - static const char *known_httpd_modules_locations [] = { HTTPD_MODULES_PATH, "/etc/httpd/modules", Index: gnome-user-share-3.0.3/data/file-share-properties.ui =================================================================== --- gnome-user-share-3.0.3.orig/data/file-share-properties.ui 2012-08-24 23:25:14.000000000 +1200 +++ gnome-user-share-3.0.3/data/file-share-properties.ui 2012-08-25 16:54:53.053074352 +1200 @@ -43,7 +43,7 @@ True - 3 + 4 2 12 6 @@ -54,8 +54,8 @@ 1 2 - 1 - 2 + 2 + 3 GTK_FILL @@ -68,8 +68,8 @@ 1 2 - 2 - 3 + 3 + 4 @@ -83,6 +83,8 @@ True + 1 + 2 2 GTK_FILL @@ -97,8 +99,8 @@ password_entry - 2 - 3 + 3 + 4 GTK_SHRINK | GTK_FILL @@ -111,8 +113,19 @@ password_combo - 1 - 2 + 2 + 3 + GTK_SHRINK | GTK_FILL + + + + + + False + True + + + 2 GTK_SHRINK | GTK_FILL Index: gnome-user-share-3.0.3/src/file-share-properties.c =================================================================== --- gnome-user-share-3.0.3.orig/src/file-share-properties.c 2012-08-25 03:25:59.000000000 +1200 +++ gnome-user-share-3.0.3/src/file-share-properties.c 2012-08-25 16:54:53.053074352 +1200 @@ -85,12 +85,16 @@ { gboolean enabled, bluetooth_enabled, bluetooth_write_enabled, require_pairing_enabled; gboolean bluetooth_obexpush_enabled, bluetooth_obexpush_notify; + gboolean have_share; char *str; PasswordSetting password_setting; AcceptSetting accept_setting; GtkWidget *check; GtkWidget *password_combo; GtkWidget *password_entry; + GtkWidget *password_combo_label; + GtkWidget *password_entry_label; + GtkWidget *webdav_info; GtkWidget *bluetooth_check; GtkWidget *allow_write_bluetooth_check; GtkWidget *require_pairing_check; @@ -119,9 +123,16 @@ accept_setting = accept_setting_from_string (str); g_free (str); + str = get_httpd_program (); + have_share = (str ? TRUE : FALSE); + g_free (str); + check = GTK_WIDGET (gtk_builder_get_object (builder, "enable_check")); password_combo = GTK_WIDGET (gtk_builder_get_object (builder, "password_combo")); password_entry = GTK_WIDGET (gtk_builder_get_object (builder, "password_entry")); + password_combo_label = GTK_WIDGET (gtk_builder_get_object (builder, "label5")); + password_entry_label = GTK_WIDGET (gtk_builder_get_object (builder, "label4")); + webdav_info = GTK_WIDGET (gtk_builder_get_object (builder, "webdav_info")); bluetooth_check = GTK_WIDGET (gtk_builder_get_object (builder, "enable_bluetooth_check")); allow_write_bluetooth_check = GTK_WIDGET (gtk_builder_get_object (builder, "allow_write_bluetooth_check")); require_pairing_check = GTK_WIDGET (gtk_builder_get_object (builder, "require_pairing_check")); @@ -131,8 +142,19 @@ /* Network */ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), enabled); - gtk_widget_set_sensitive (password_combo, enabled); - gtk_widget_set_sensitive (password_entry, enabled && password_setting != PASSWORD_NEVER); + gtk_widget_set_sensitive (check, have_share); + gtk_widget_set_sensitive (password_combo_label, have_share); + gtk_widget_set_sensitive (password_entry_label, have_share); + if (have_share) { + gtk_widget_hide (webdav_info); + } else { + str = g_strdup_printf ("%s", _("This feature cannot be enabled because the required packages are not installed on your system")); + gtk_label_set_markup (GTK_LABEL (webdav_info), str); + gtk_widget_show (webdav_info); + g_free (str); + } + gtk_widget_set_sensitive (password_combo, enabled && have_share); + gtk_widget_set_sensitive (password_entry, enabled && password_setting != PASSWORD_NEVER && have_share); gtk_combo_box_set_active (GTK_COMBO_BOX (password_combo), password_setting); debian/copyright0000664000000000000000000000321212030741466011124 0ustar This package was debianized by Jeff Waugh on Fri, 26 Nov 2004 22:40:10 +1100. It was downloaded from http://ftp.gnome.org/pub/GNOME/sources/gnome-user-share/ Upstream Authors: Alexander Larsson Bastien Nocera Copyright Holders: Copyright © 2004-2008 Red Hat, Inc. Copyright © 2004-2005 Shaun McCance License: This package is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This package is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. On Debian systems, the complete text of the GNU General Public License can be found in `/usr/share/common-licenses/GPL-2'. For md5.[ch]: This code implements the MD5 message-digest algorithm. The algorithm is due to Ron Rivest. This code was written by Colin Plumb in 1993, no copyright is claimed. This code is in the public domain; do with it what you wish. Equivalent code is available from RSA Data Security, Inc. This code has been tested against that, and is equivalent, except that you don't need to include two pages of legalese with every copy.