← Back to branch summary

~ubuntu-branches/ubuntu/trusty/vino/trusty-proposed

« back to all changes in this revision

Viewing changes to debian/patches/06_use-ubuntu-help.patch

  • Committer: Package Import Robot
  • Author(s): Sebastien Bacher
  • Date: 2012-01-26 16:26:41 UTC
  • Revision ID: package-import@ubuntu.com-20120126162641-s7orp2c9dhdrt7a3
Tags: 3.3.3-0ubuntu2
https://launchpad.net/bugs/840696
https://launchpad.net/bugs/841384
https://launchpad.net/bugs/854512
https://launchpad.net/bugs/903879
* debian/patches/05_use-system-miniupnpc.patch:
  - update to the current libminiupnpc abi, the previous version was still
    using the source .h copies and the functions prototypes and code were
    different from the runtime (lp: #840696, #841384, #854512, #903879).

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/06_use-ubuntu-help.patch
1
1
Description: Use Ubuntu system help instead of GNOME's
2
2
Forwarded: Not needed
3
 
Index: vino-3.1.92/server/vino-status-icon.c
 
3
Index: vino-3.3.3/server/vino-status-icon.c
4
4
===================================================================
5
 
--- vino-3.1.92.orig/server/vino-status-icon.c  2011-09-07 14:42:36.000000000 -0400
6
 
+++ vino-3.1.92/server/vino-status-icon.c       2011-09-19 14:07:30.347955973 -0400
 
5
--- vino-3.3.3.orig/server/vino-status-icon.c   2011-11-22 17:34:33.000000000 +0100
 
6
+++ vino-3.3.3/server/vino-status-icon.c        2012-01-26 16:19:48.128307904 +0100
7
7
@@ -227,7 +227,7 @@
8
8
 
9
9
   screen = gtk_status_icon_get_screen (GTK_STATUS_ICON (icon));
13
13
                     GDK_CURRENT_TIME,
14
14
                     &error))
15
15
     {
16
 
Index: vino-3.1.92/server/vino-status-tube-icon.c
 
16
Index: vino-3.3.3/server/vino-status-tube-icon.c
17
17
===================================================================
18
 
--- vino-3.1.92.orig/server/vino-status-tube-icon.c     2011-09-07 14:42:36.000000000 -0400
19
 
+++ vino-3.1.92/server/vino-status-tube-icon.c  2011-09-19 14:07:30.347955973 -0400
 
18
--- vino-3.3.3.orig/server/vino-status-tube-icon.c      2011-09-07 20:42:36.000000000 +0200
 
19
+++ vino-3.3.3/server/vino-status-tube-icon.c   2012-01-26 16:19:48.128307904 +0100
20
20
@@ -194,7 +194,7 @@
21
21
   GError    *error = NULL;
22
22
 
26
26
       GDK_CURRENT_TIME, &error))
27
27
     {
28
28
       vino_util_show_error (_("Error displaying help"), error->message, NULL);
29
 
Index: vino-3.1.92/capplet/vino-preferences.c
 
29
Index: vino-3.3.3/capplet/vino-preferences.c
30
30
===================================================================
31
 
--- vino-3.1.92.orig/capplet/vino-preferences.c 2011-09-19 14:08:06.078008377 -0400
32
 
+++ vino-3.1.92/capplet/vino-preferences.c      2011-09-19 14:08:20.218029114 -0400
 
31
--- vino-3.3.3.orig/capplet/vino-preferences.c  2011-09-07 20:42:36.000000000 +0200
 
32
+++ vino-3.3.3/capplet/vino-preferences.c       2012-01-26 16:19:48.128307904 +0100
33
33
@@ -232,7 +232,7 @@
34
34
     case GTK_RESPONSE_HELP:
35
35
       screen = gtk_widget_get_screen (widget);