← Back to branch summary

~ubuntu-branches/ubuntu/vivid/vino/vivid-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: 2013-11-18 15:53:41 UTC
  • mfrom: (1.4.8)
  • Revision ID: package-import@ubuntu.com-20131118155341-u7aet62hkfzomvi6
Tags: 3.8.1-0ubuntu1
* New upstream version, drop changes included in the new version
* debian/patches/revert_use_prompt_notification.patch:
  - revert upstream change to use a notification with actions to accept or
    deny clients, since notify-osd doesn't support those, we keep using
    the old standalone dialog instead
* debian/patches/git_tls_read.patch:
  - "Fix reading of TLS data to account for cached data"

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.3.3/server/vino-status-icon.c
 
3
Index: vino-3.8.1/server/vino-status-icon.c
4
4
===================================================================
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
 
@@ -227,7 +227,7 @@
 
5
--- vino-3.8.1.orig/server/vino-status-icon.c   2013-11-18 15:14:13.574555625 +0100
 
6
+++ vino-3.8.1/server/vino-status-icon.c        2013-11-18 15:14:13.566555625 +0100
 
7
@@ -223,7 +223,7 @@
8
8
 
9
9
   screen = gtk_status_icon_get_screen (GTK_STATUS_ICON (icon));
10
10
   if (!gtk_show_uri (screen,
13
13
                     GDK_CURRENT_TIME,
14
14
                     &error))
15
15
     {
16
 
Index: vino-3.3.3/server/vino-status-tube-icon.c
 
16
Index: vino-3.8.1/server/vino-status-tube-icon.c
17
17
===================================================================
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
 
@@ -194,7 +194,7 @@
 
18
--- vino-3.8.1.orig/server/vino-status-tube-icon.c      2013-11-18 15:14:13.574555625 +0100
 
19
+++ vino-3.8.1/server/vino-status-tube-icon.c   2013-11-18 15:14:13.570555625 +0100
 
20
@@ -186,7 +186,7 @@
21
21
   GError    *error = NULL;
22
22
 
23
23
   screen = gtk_status_icon_get_screen (GTK_STATUS_ICON (icon));
26
26
       GDK_CURRENT_TIME, &error))
27
27
     {
28
28
       vino_util_show_error (_("Error displaying help"), error->message, NULL);
29
 
Index: vino-3.3.3/capplet/vino-preferences.c
 
29
Index: vino-3.8.1/capplet/vino-preferences.c
30
30
===================================================================
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
 
31
--- vino-3.8.1.orig/capplet/vino-preferences.c  2013-11-18 15:14:13.574555625 +0100
 
32
+++ vino-3.8.1/capplet/vino-preferences.c       2013-11-18 15:14:27.000000000 +0100
33
33
@@ -232,7 +232,7 @@
34
34
     case GTK_RESPONSE_HELP:
35
35
       screen = gtk_widget_get_screen (widget);