[SCM] mate-user-share Debian package branch, master, updated. 8622bf6a10a3ca3b49231f3dee5366890487aa1b

[Vangelis Mouhtsis]

Gitweb-URL: http://git.debian.org/?p=pkg-mate/mate-user-share.git;a=commitdiff;h=d868ca0

The following commit has been merged in the master branch:
commit d868ca0c47a1062ce9aa34afd970f7c440173bb1
Author: Vangelis Mouhtsis <vangelis at gnugr.org>
Date:   Thu Apr 24 08:31:26 2014 +0300

    debian/patches: Drop 02_fix-callback-argument.patch: rejects in file src/user_share.c
---
 debian/patches/02_fix-callback-argument.patch | 24 ------------------------
 debian/patches/series                         |  2 +-
 2 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/debian/patches/02_fix-callback-argument.patch b/debian/patches/02_fix-callback-argument.patch
deleted file mode 100644
index 22f1162..0000000
--- a/debian/patches/02_fix-callback-argument.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 86a4c47fb645ef8895557c52b6ef67c7091ad6e9 Mon Sep 17 00:00:00 2001
-From: Stefano Karapetsas <stefano at karapetsas.com>
-Date: Tue, 30 Apr 2013 12:56:26 +0000
-Subject: Fix data passed to disabled_timeout_callback
-
-In mate-user-share/src/user_share.c, the wrong variable is being passed as
-a gsettings pointer to the disabled_timeout_callback.
-https://bugs.launchpad.net/linuxmint/+bug/1005649/comments/36
----
-diff --git a/src/user_share.c b/src/user_share.c
-index 35e4a27..53ceec1 100644
---- a/src/user_share.c
-+++ b/src/user_share.c
-@@ -346,7 +346,7 @@ file_sharing_enabled_changed (GSettings *settings, gchar *key, gpointer data)
- 		http_down ();
- 		disabled_timeout_tag = g_timeout_add_seconds (3,
- 							      (GSourceFunc)disabled_timeout_callback,
--							      client);
-+							      settings);
- 	}
- }
- 
---
-cgit 
diff --git a/debian/patches/series b/debian/patches/series
index abd9f1d..0b9e28f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
 01_apache-config.patch
-02_fix-callback-argument.patch
+

-- 
mate-user-share Debian package