From 9af4eb021fd5b34ec1fa4ee6eb01eab0b3924ebc Mon Sep 17 00:00:00 2001
From: raveit65 <chat-to-me@raveit.de>
Date: Sat, 13 Oct 2012 00:42:44 +0200
Subject: fix incorrect FSF address

---
 src/user_share.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/user_share.c')

diff --git a/src/user_share.c b/src/user_share.c
index ae7b5ff..e3a0e38 100644
--- a/src/user_share.c
+++ b/src/user_share.c
@@ -15,7 +15,7 @@
  *
  *  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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  *  Authors: Alexander Larsson <alexl@redhat.com>
  *
-- 
cgit v1.2.1


From 9acddbc84bec236ca91fa210b6b2164a60895615 Mon Sep 17 00:00:00 2001
From: Jasmine Hassan <jasmine.aura@gmail.com>
Date: Mon, 29 Oct 2012 07:33:06 +0200
Subject: [user-share] add missing glib/gstdio.h include

This is needed for g_rename()

https://bugzilla.gnome.org/show_bug.cgi?id=676515

http://git.gnome.org/browse/gnome-user-share/commit/?id=0a5f5e09ee21207b9fb21a5bb661d0adb8d8e927
---
 src/user_share.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/user_share.c')

diff --git a/src/user_share.c b/src/user_share.c
index e3a0e38..a646b84 100644
--- a/src/user_share.c
+++ b/src/user_share.c
@@ -26,6 +26,7 @@
 #include <gdk/gdkx.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
+#include <glib/gstdio.h>
 #include <bluetooth-client.h>
 #include <X11/Xlib.h>
 
-- 
cgit v1.2.1


From 4c6a1bdb10a2c554aedb6bb75a24ca61ef421d6d Mon Sep 17 00:00:00 2001
From: Jasmine Hassan <jasmine.aura@gmail.com>
Date: Mon, 29 Oct 2012 07:56:23 +0200
Subject: [user-share] declare the x_fd variable as unused

Fixes a GCC warning about set but not used variables.
https://bugzilla.gnome.org/show_bug.cgi?id=676515
http://git.gnome.org/browse/gnome-user-share/commit/?id=ba5961cb3973df00a2260adc2826ec49077c2484
---
 src/user_share.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/user_share.c')

diff --git a/src/user_share.c b/src/user_share.c
index a646b84..91e9d69 100644
--- a/src/user_share.c
+++ b/src/user_share.c
@@ -427,7 +427,7 @@ main (int argc, char **argv)
 {
 	GSettings *settings;
 	Display *xdisplay;
-	int x_fd;
+	G_GNUC_UNUSED x_fd;
 	Window selection_owner;
 	Atom xatom;
 
-- 
cgit v1.2.1