← Back to branch summary

~ubuntu-branches/ubuntu/wily/gpaste/wily

« back to all changes in this revision

Viewing changes to ubuntu-patches/0002-ubuntu-fix-for-ubuntu-breaking-gnome-shell-API-compa.patch

  • Committer: Package Import Robot
  • Author(s): Jérémy Lal
  • Date: 2015-06-19 11:05:16 UTC
  • mfrom: (6.1.4 sid)
  • Revision ID: package-import@ubuntu.com-20150619110516-h53wz9xi9i4k3smb
Tags: 3.16.2.1-1
http://bugs.debian.org/789255
* Imported Upstream version 3.16.2.1 (Closes: #789255)
* gpaste-applet does not need a manpage - upstream dropped it
* Build-Depends gtk >= 3.16
* Depends gnome-shell >= 3.16
* Major API changes, bump soname to 3 

Show diffs side-by-side

added added

removed removed

Lines of Context:
ubuntu-patches/0002-ubuntu-fix-for-ubuntu-breaking-gnome-shell-API-compa.patch
1
 
From 9e36023c6544a0017465dac96f616f540898c5c0 Mon Sep 17 00:00:00 2001
2
 
From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
3
 
Date: Sun, 11 May 2014 10:46:35 +0900
4
 
Subject: [PATCH 2/2] ubuntu: fix for ubuntu breaking gnome-shell API
5
 
 compatibility
6
 
 
7
 
Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
8
 
---
9
 
 src/libgpaste/gnome-shell-client/gpaste-gnome-shell-client.c | 4 +---
10
 
 1 file changed, 1 insertion(+), 3 deletions(-)
11
 
 
12
 
diff --git a/src/libgpaste/gnome-shell-client/gpaste-gnome-shell-client.c b/src/libgpaste/gnome-shell-client/gpaste-gnome-shell-client.c
13
 
index 62107c8..ea8e134 100644
14
 
--- a/src/libgpaste/gnome-shell-client/gpaste-gnome-shell-client.c
15
 
+++ b/src/libgpaste/gnome-shell-client/gpaste-gnome-shell-client.c
16
 
@@ -73,7 +73,6 @@
17
 
             "<signal name='" G_PASTE_GNOME_SHELL_SIG_ACCELERATOR_ACTIVATED "'>"                            \
18
 
                 "<arg name='action'    type='u' />"                                                        \
19
 
                 "<arg name='deviceid'  type='u' />"                                                        \
20
 
-                "<arg name='timestamp' type='u' />"                                                        \
21
 
             "</signal>"                                                                                    \
22
 
             "<property name='" G_PASTE_GNOME_SHELL_PROP_MODE "'            type='s' access='read'      />" \
23
 
             "<property name='" G_PASTE_GNOME_SHELL_PROP_OVERVIEW_ACTIVE "' type='b' access='readwrite' />" \
24
 
@@ -798,13 +797,12 @@ g_paste_gnome_shell_client_g_signal (GDBusProxy  *proxy,
25
 
         g_variant_iter_init (&params_iter, parameters);
26
 
         G_PASTE_CLEANUP_VARIANT_UNREF GVariant *action    = g_variant_iter_next_value (&params_iter);
27
 
         G_PASTE_CLEANUP_VARIANT_UNREF GVariant *deviceid  = g_variant_iter_next_value (&params_iter);
28
 
-        G_PASTE_CLEANUP_VARIANT_UNREF GVariant *timestamp = g_variant_iter_next_value (&params_iter);
29
 
         g_signal_emit (self,
30
 
                        signals[ACCELERATOR_ACTIVATED],
31
 
                        0, /* detail */
32
 
                        g_variant_get_uint32 (action),
33
 
                        g_variant_get_uint32 (deviceid),
34
 
-                       g_variant_get_uint32 (timestamp),
35
 
+                       0,
36
 
                        NULL);
37
 
     }
38
 
 }
39
 
2.1.1
40