~ubuntu-branches/ubuntu/raring/gnome-screensaver/raring-proposed

« back to all changes in this revision

Viewing changes to debian/patches/18_unity_dialog_layout.patch

  • Committer: Package Import Robot
  • Author(s): Robert Ancell
  • Date: 2012-07-28 19:29:45 UTC
  • mfrom: (1.3.12)
  • Revision ID: package-import@ubuntu.com-20120728192945-m5li4dre8xyn4kmk
Tags: 3.5.4-0ubuntu1
New upstream release (LP: #1018710)

Show diffs side-by-side

added added

removed removed

Lines of Context:
3
3
Author: Marc Deslauriers <marc.deslauriers@canonical.com>
4
4
Forwarded: no, Ubuntu-specific
5
5
 
6
 
Index: gnome-screensaver/src/gs-lock-plug.c
 
6
Index: gnome-screensaver-3.4.2/src/gs-lock-plug.c
7
7
===================================================================
8
 
--- gnome-screensaver.orig/src/gs-lock-plug.c   2012-02-25 21:33:54.000000000 +0100
9
 
+++ gnome-screensaver/src/gs-lock-plug.c        2012-03-07 15:13:56.989846836 +0100
10
 
@@ -72,6 +72,7 @@
 
8
--- gnome-screensaver-3.4.2.orig/src/gs-lock-plug.c     2012-04-15 07:29:00.000000000 +1200
 
9
+++ gnome-screensaver-3.4.2/src/gs-lock-plug.c  2012-06-28 10:50:53.955326278 +1200
 
10
@@ -71,6 +71,7 @@
11
11
 
12
12
         GtkWidget   *notebook;
13
13
         GtkWidget   *auth_face_image;
15
15
         GtkWidget   *auth_prompt_label;
16
16
         GtkWidget   *auth_prompt_entry;
17
17
         GtkWidget   *auth_prompt_box;
18
 
@@ -1254,9 +1255,18 @@
 
18
@@ -1241,9 +1242,18 @@
19
19
         gtk_widget_set_sensitive (plug->priv->auth_unlock_button, TRUE);
20
20
         gtk_widget_show (plug->priv->auth_unlock_button);
21
21
         gtk_widget_grab_default (plug->priv->auth_unlock_button);
35
35
         gtk_widget_show (plug->priv->auth_prompt_label);
36
36
         gtk_entry_set_visibility (GTK_ENTRY (plug->priv->auth_prompt_entry), visible);
37
37
         gtk_widget_set_sensitive (plug->priv->auth_prompt_entry, TRUE);
38
 
@@ -1387,6 +1397,39 @@
 
38
@@ -1374,6 +1384,39 @@
39
39
         gs_profile_end ("page one buttons");
40
40
 }
41
41
 
75
75
 static void
76
76
 create_page_one (GSLockPlug *plug)
77
77
 {
78
 
@@ -1418,25 +1461,59 @@
 
78
@@ -1405,25 +1448,59 @@
79
79
         gtk_box_pack_start (GTK_BOX (hbox), plug->priv->auth_prompt_kbd_layout_indicator, FALSE, FALSE, 0);
80
80
 #endif
81
81