← Back to branch summary

~ubuntu-branches/ubuntu/natty/gdm/natty-updates

« back to all changes in this revision

Viewing changes to debian/patches/09_gdmsetup.patch

  • Committer: Bazaar Package Importer
  • Author(s): Robert Ancell
  • Date: 2011-04-08 16:35:19 UTC
  • mfrom: (1.4.48 upstream)
  • Revision ID: james.westby@ubuntu.com-20110408163519-nd6602f2j3c2n2qc
Tags: 2.32.1-0ubuntu1
* New upstream release
* debian/patches/01git_xdmcp_ipv6.patch:
* debian/patches/43_CVE-2011-0727.patch:
  - Applied upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/09_gdmsetup.patch
2
2
Bug: http://bugzilla.gnome.org/show_bug.cgi?id=587750
3
3
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gdm/+bug/395299
4
4
 
5
 
Index: gdm-2.30.5/configure.ac
 
5
Index: gdm-2.32.1/configure.ac
6
6
===================================================================
7
 
--- gdm-2.30.5.orig/configure.ac        2010-08-17 22:19:05.000000000 +0200
8
 
+++ gdm-2.30.5/configure.ac     2010-08-17 22:19:18.000000000 +0200
9
 
@@ -118,6 +118,14 @@
 
7
--- gdm-2.32.1.orig/configure.ac        2011-04-08 16:33:45.141921352 +1000
 
8
+++ gdm-2.32.1/configure.ac     2011-04-08 16:33:46.921921354 +1000
 
9
@@ -121,6 +121,14 @@
10
10
 AC_SUBST(UPOWER_CFLAGS)
11
11
 AC_SUBST(UPOWER_LIBS)
12
12
 
29
29
 gui/simple-greeter/Makefile
30
30
 gui/simple-greeter/libnotificationarea/Makefile
31
31
 gui/simple-chooser/Makefile
32
 
Index: gdm-2.30.5/gui/gdmsetup/gdm-sessions.c
 
32
Index: gdm-2.32.1/gui/gdmsetup/gdm-sessions.c
33
33
===================================================================
34
34
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
35
 
+++ gdm-2.30.5/gui/gdmsetup/gdm-sessions.c      2010-08-17 22:19:05.000000000 +0200
 
35
+++ gdm-2.32.1/gui/gdmsetup/gdm-sessions.c      2011-04-08 16:33:46.921921354 +1000
36
36
@@ -0,0 +1,265 @@
37
37
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
38
38
+ *
299
299
+
300
300
+        return TRUE;
301
301
+}
302
 
Index: gdm-2.30.5/gui/gdmsetup/gdm-sessions.h
 
302
Index: gdm-2.32.1/gui/gdmsetup/gdm-sessions.h
303
303
===================================================================
304
304
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
305
 
+++ gdm-2.30.5/gui/gdmsetup/gdm-sessions.h      2010-08-17 22:19:05.000000000 +0200
 
305
+++ gdm-2.32.1/gui/gdmsetup/gdm-sessions.h      2011-04-08 16:33:46.921921354 +1000
306
306
@@ -0,0 +1,38 @@
307
307
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
308
308
+ *
342
342
+G_END_DECLS
343
343
+
344
344
+#endif /* __GDM_SESSION_H */
345
 
Index: gdm-2.30.5/gui/gdmsetup/gdmsetup.c
 
345
Index: gdm-2.32.1/gui/gdmsetup/gdmsetup.c
346
346
===================================================================
347
347
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
348
 
+++ gdm-2.30.5/gui/gdmsetup/gdmsetup.c  2010-08-17 22:19:05.000000000 +0200
 
348
+++ gdm-2.32.1/gui/gdmsetup/gdmsetup.c  2011-04-08 16:33:46.921921354 +1000
349
349
@@ -0,0 +1,717 @@
350
350
+#ifdef HAVE_CONFIG_H
351
351
+#include "config.h"
1064
1064
+    
1065
1065
+    return 0;
1066
1066
+}
1067
 
Index: gdm-2.30.5/gui/gdmsetup/gdmsetup.desktop.in
 
1067
Index: gdm-2.32.1/gui/gdmsetup/gdmsetup.desktop.in
1068
1068
===================================================================
1069
1069
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
1070
 
+++ gdm-2.30.5/gui/gdmsetup/gdmsetup.desktop.in 2010-08-17 22:19:05.000000000 +0200
 
1070
+++ gdm-2.32.1/gui/gdmsetup/gdmsetup.desktop.in 2011-04-08 16:33:46.921921354 +1000
1071
1071
@@ -0,0 +1,12 @@
1072
1072
+[Desktop Entry]
1073
1073
+_Name=Login Screen
1081
1081
+X-GNOME-Bugzilla-Bugzilla=GNOME
1082
1082
+X-GNOME-Bugzilla-Product=gdm
1083
1083
+X-GNOME-Bugzilla-Component=general
1084
 
Index: gdm-2.30.5/gui/gdmsetup/gdmsetup.ui
 
1084
Index: gdm-2.32.1/gui/gdmsetup/gdmsetup.ui
1085
1085
===================================================================
1086
1086
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
1087
 
+++ gdm-2.30.5/gui/gdmsetup/gdmsetup.ui 2010-08-17 22:19:05.000000000 +0200
 
1087
+++ gdm-2.32.1/gui/gdmsetup/gdmsetup.ui 2011-04-08 16:33:46.921921354 +1000
1088
1088
@@ -0,0 +1,345 @@
1089
1089
+<?xml version="1.0"?>
1090
1090
+<interface>
1431
1431
+    <property name="step_increment">1</property>
1432
1432
+  </object>
1433
1433
+</interface>
1434
 
Index: gdm-2.30.5/gui/gdmsetup/gdm-user.c
 
1434
Index: gdm-2.32.1/gui/gdmsetup/gdm-user.c
1435
1435
===================================================================
1436
1436
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
1437
 
+++ gdm-2.30.5/gui/gdmsetup/gdm-user.c  2010-08-17 22:19:05.000000000 +0200
 
1437
+++ gdm-2.32.1/gui/gdmsetup/gdm-user.c  2011-04-08 16:33:46.921921354 +1000
1438
1438
@@ -0,0 +1,1172 @@
1439
1439
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
1440
1440
+ *
2608
2608
+
2609
2609
+        return pixbuf;
2610
2610
+}
2611
 
Index: gdm-2.30.5/gui/gdmsetup/gdm-user.h
 
2611
Index: gdm-2.32.1/gui/gdmsetup/gdm-user.h
2612
2612
===================================================================
2613
2613
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
2614
 
+++ gdm-2.30.5/gui/gdmsetup/gdm-user.h  2010-08-17 22:19:05.000000000 +0200
 
2614
+++ gdm-2.32.1/gui/gdmsetup/gdm-user.h  2011-04-08 16:33:46.921921354 +1000
2615
2615
@@ -0,0 +1,59 @@
2616
2616
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
2617
2617
+ *
2672
2672
+G_END_DECLS
2673
2673
+
2674
2674
+#endif
2675
 
Index: gdm-2.30.5/gui/gdmsetup/gdm-user-manager.c
 
2675
Index: gdm-2.32.1/gui/gdmsetup/gdm-user-manager.c
2676
2676
===================================================================
2677
2677
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
2678
 
+++ gdm-2.30.5/gui/gdmsetup/gdm-user-manager.c  2010-08-17 22:19:05.000000000 +0200
 
2678
+++ gdm-2.32.1/gui/gdmsetup/gdm-user-manager.c  2011-04-08 16:33:46.931921354 +1000
2679
2679
@@ -0,0 +1,1658 @@
2680
2680
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
2681
2681
+ *
4335
4335
+
4336
4336
+        return GDM_USER_MANAGER (user_manager_object);
4337
4337
+}
4338
 
Index: gdm-2.30.5/gui/gdmsetup/gdm-user-manager.h
 
4338
Index: gdm-2.32.1/gui/gdmsetup/gdm-user-manager.h
4339
4339
===================================================================
4340
4340
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
4341
 
+++ gdm-2.30.5/gui/gdmsetup/gdm-user-manager.h  2010-08-17 22:19:05.000000000 +0200
 
4341
+++ gdm-2.32.1/gui/gdmsetup/gdm-user-manager.h  2011-04-08 16:33:46.931921354 +1000
4342
4342
@@ -0,0 +1,87 @@
4343
4343
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
4344
4344
+ *
4427
4427
+G_END_DECLS
4428
4428
+
4429
4429
+#endif /* __GDM_USER_MANAGER_H */
4430
 
Index: gdm-2.30.5/gui/gdmsetup/gdm-user-private.h
 
4430
Index: gdm-2.32.1/gui/gdmsetup/gdm-user-private.h
4431
4431
===================================================================
4432
4432
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
4433
 
+++ gdm-2.30.5/gui/gdmsetup/gdm-user-private.h  2010-08-17 22:19:05.000000000 +0200
 
4433
+++ gdm-2.32.1/gui/gdmsetup/gdm-user-private.h  2011-04-08 16:33:46.931921354 +1000
4434
4434
@@ -0,0 +1,44 @@
4435
4435
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
4436
4436
+ *
4476
4476
+G_END_DECLS
4477
4477
+
4478
4478
+#endif /* !__GDM_USER_PRIVATE__ */
4479
 
Index: gdm-2.30.5/gui/gdmsetup/Makefile.am
 
4479
Index: gdm-2.32.1/gui/gdmsetup/Makefile.am
4480
4480
===================================================================
4481
4481
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
4482
 
+++ gdm-2.30.5/gui/gdmsetup/Makefile.am 2010-08-17 22:19:05.000000000 +0200
 
4482
+++ gdm-2.32.1/gui/gdmsetup/Makefile.am 2011-04-08 16:33:46.931921354 +1000
4483
4483
@@ -0,0 +1,40 @@
4484
4484
+NULL =
4485
4485
+
4521
4521
+       $(ui_DATA)              \
4522
4522
+       $(Utilities_in_files)   \
4523
4523
+       $(NULL)
4524
 
Index: gdm-2.30.5/po/POTFILES.in
 
4524
Index: gdm-2.32.1/po/POTFILES.in
4525
4525
===================================================================
4526
 
--- gdm-2.30.5.orig/po/POTFILES.in      2010-08-17 22:19:05.000000000 +0200
4527
 
+++ gdm-2.30.5/po/POTFILES.in   2010-08-17 22:19:05.000000000 +0200
 
4526
--- gdm-2.32.1.orig/po/POTFILES.in      2011-04-08 16:33:45.161921352 +1000
 
4527
+++ gdm-2.32.1/po/POTFILES.in   2011-04-08 16:33:46.931921354 +1000
4528
4528
@@ -60,6 +60,9 @@
4529
4529
 data/greeter-autostart/metacity.desktop.in
4530
4530
 data/greeter-autostart/orca-screen-reader.desktop.in
4535
4535
 gui/simple-chooser/gdm-host-chooser-dialog.c
4536
4536
 gui/simple-chooser/gdm-host-chooser-widget.c
4537
4537
 gui/simple-greeter/gdm-cell-renderer-timer.c
4538
 
Index: gdm-2.30.5/gui/Makefile.am
 
4538
Index: gdm-2.32.1/gui/Makefile.am
4539
4539
===================================================================
4540
 
--- gdm-2.30.5.orig/gui/Makefile.am     2010-08-11 16:19:44.000000000 +0200
4541
 
+++ gdm-2.30.5/gui/Makefile.am  2010-08-17 22:19:05.000000000 +0200
 
4540
--- gdm-2.32.1.orig/gui/Makefile.am     2011-04-08 16:33:45.041921352 +1000
 
4541
+++ gdm-2.32.1/gui/Makefile.am  2011-04-08 16:33:46.931921354 +1000
4542
4542
@@ -3,6 +3,7 @@
4543
4543
 SUBDIRS =                      \
4544
4544
        simple-greeter          \