diff --git a/gdm-devkit-power.patch b/gdm-devkit-power.patch new file mode 100644 index 0000000..29fae72 --- /dev/null +++ b/gdm-devkit-power.patch @@ -0,0 +1,186 @@ +From aa132a553b871a19a8d23fe8e9d93f736f2a4faf Mon Sep 17 00:00:00 2001 +From: Richard Hughes +Date: Mon, 28 Sep 2009 09:14:33 +0100 +Subject: [PATCH] Convert gdm from using gnome-power-manager to DeviceKit-power + +--- + configure.ac | 7 ++ + gui/simple-greeter/Makefile.am | 4 + + gui/simple-greeter/gdm-greeter-login-window.c | 84 ++++++------------------- + 3 files changed, 31 insertions(+), 64 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 756890a..2cae1cf 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -51,6 +51,7 @@ LIBXKLAVIER_REQUIRED_VERSION=4.0 + LIBCANBERRA_GTK_REQUIRED_VERSION=0.4 + #FONTCONFIG_REQUIRED_VERSION=2.6.0 + FONTCONFIG_REQUIRED_VERSION=2.5.0 ++DEVKIT_POWER_REQUIRED_VERSION=008 + + EXTRA_COMPILE_WARNINGS(yes) + +@@ -103,6 +104,12 @@ PKG_CHECK_MODULES(GCONF, + AC_SUBST(GCONF_CFLAGS) + AC_SUBST(GCONF_LIBS) + ++PKG_CHECK_MODULES(DEVKIT_POWER, ++ devkit-power-gobject >= $DEVKIT_POWER_REQUIRED_VERSION ++) ++AC_SUBST(DEVKIT_POWER_CFLAGS) ++AC_SUBST(DEVKIT_POWER_LIBS) ++ + PKG_CHECK_MODULES(SIMPLE_GREETER, + dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION + gtk+-2.0 >= $GTK_REQUIRED_VERSION +diff --git a/gui/simple-greeter/Makefile.am b/gui/simple-greeter/Makefile.am +index 8c9ae46..4c06bc3 100644 +--- a/gui/simple-greeter/Makefile.am ++++ b/gui/simple-greeter/Makefile.am +@@ -18,6 +18,8 @@ AM_CPPFLAGS = \ + -DSBINDIR=\""$(sbindir)"\" \ + -DGDM_CACHE_DIR=\""$(localstatedir)/cache/gdm"\" \ + -DAT_SPI_REGISTRYD_DIR="\"$(AT_SPI_REGISTRYD_DIR)\"" \ ++ $(DEVKIT_POWER_CFLAGS) \ ++ -DI_KNOW_THE_DEVICEKIT_POWER_API_IS_SUBJECT_TO_CHANGE \ + $(DISABLE_DEPRECATED_CFLAGS) \ + $(GTK_CFLAGS) \ + $(SIMPLE_GREETER_CFLAGS) \ +@@ -90,6 +92,7 @@ test_greeter_login_window_LDADD = \ + libgdmuser.la \ + $(COMMON_LIBS) \ + $(SIMPLE_GREETER_LIBS) \ ++ $(DEVKIT_POWER_LIBS) \ + $(RBAC_LIBS) \ + $(NULL) + +@@ -324,6 +327,7 @@ gdm_simple_greeter_LDADD = \ + $(SIMPLE_GREETER_LIBS) \ + $(RBAC_LIBS) \ + $(LIBXKLAVIER_LIBS) \ ++ $(DEVKIT_POWER_LIBS) \ + $(NULL) + + gladedir = $(pkgdatadir) +diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c +index c7ea5d6..7d4ef83 100644 +--- a/gui/simple-greeter/gdm-greeter-login-window.c ++++ b/gui/simple-greeter/gdm-greeter-login-window.c +@@ -56,6 +56,8 @@ + #include + #include + ++#include ++ + #include "gdm-settings-client.h" + #include "gdm-settings-keys.h" + #include "gdm-profile.h" +@@ -79,10 +81,6 @@ + #define CK_SEAT_INTERFACE "org.freedesktop.ConsoleKit.Seat" + #define CK_SESSION_INTERFACE "org.freedesktop.ConsoleKit.Session" + +-#define GPM_DBUS_NAME "org.freedesktop.PowerManagement" +-#define GPM_DBUS_PATH "/org/freedesktop/PowerManagement" +-#define GPM_DBUS_INTERFACE "org.freedesktop.PowerManagement" +- + #define GLADE_XML_FILE "gdm-greeter-login-window.glade" + + #define KEY_GREETER_DIR "/apps/gdm/simple-greeter" +@@ -480,40 +478,15 @@ adjust_other_login_visibility(GdmGreeterLoginWindow *login_window) + static gboolean + can_suspend (GdmGreeterLoginWindow *login_window) + { +- DBusGConnection *connection; +- DBusGProxy *proxy; +- GError *error; +- gboolean ret; +- gboolean res; +- +- error = NULL; +- connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error); +- if (error != NULL) { +- g_warning ("Couldn't connect to power manager: %s", error->message); +- g_error_free (error); +- return FALSE; +- } +- proxy = dbus_g_proxy_new_for_name (connection, +- GPM_DBUS_NAME, +- GPM_DBUS_PATH, +- GPM_DBUS_INTERFACE); +- ret = FALSE; +- +- res = dbus_g_proxy_call (proxy, "CanSuspend", +- &error, +- G_TYPE_INVALID, +- G_TYPE_BOOLEAN, +- &ret, +- G_TYPE_INVALID); +- if (! res) { +- if (error != NULL) { +- g_warning ("Could not ask power manager if user can suspend: %s", +- error->message); +- g_error_free (error); +- } +- ret = FALSE; +- } ++ gboolean ret; ++ DkpClient *dkp_client; + ++ /* use DeviceKit-power to get data */ ++ dkp_client = dkp_client_new (); ++ g_object_get (dkp_client, ++ "can-suspend", &ret, ++ NULL); ++ g_object_unref (dkp_client); + return ret; + } + +@@ -655,36 +628,19 @@ do_disconnect (GdmGreeterLoginWindow *login_window) + static void + do_suspend (GdmGreeterLoginWindow *login_window) + { +- GError *error; +- DBusGConnection *connection; +- DBusGProxy *proxy; ++ gboolean ret; ++ DkpClient *dkp_client; ++ GError *error = NULL; + +- g_debug ("GdmGreeterLoginWindow: Suspend button clicked"); +- +- error = NULL; +- connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error); +- if (error != NULL) { ++ /* use DeviceKit-power to get data */ ++ dkp_client = dkp_client_new (); ++ ret = dkp_client_suspend (dkp_client, &error); ++ if (!ret) { + g_warning ("Couldn't suspend: %s", error->message); + g_error_free (error); + return; + } +- proxy = dbus_g_proxy_new_for_name (connection, +- GPM_DBUS_NAME, +- GPM_DBUS_PATH, +- GPM_DBUS_INTERFACE); +- error = NULL; +- dbus_g_proxy_call (proxy, +- "Suspend", +- &error, +- G_TYPE_INVALID, +- G_TYPE_INVALID); +- if (error != NULL) { +- g_warning ("Couldn't suspend: %s", error->message); +- g_error_free (error); +- return; +- } +- +- g_object_unref (proxy); ++ g_object_unref (dkp_client); + } + + static void +-- +1.6.4.4 + diff --git a/gdm-greeter-greater-ui.patch b/gdm-greeter-greater-ui.patch index 057b406..28852a3 100644 --- a/gdm-greeter-greater-ui.patch +++ b/gdm-greeter-greater-ui.patch @@ -1,8 +1,8 @@ -Index: gdm-2.24.0/gui/simple-greeter/gdm-greeter-login-window.c +Index: gdm-2.28.0/gui/simple-greeter/gdm-greeter-login-window.c =================================================================== ---- gdm-2.24.0.orig/gui/simple-greeter/gdm-greeter-login-window.c -+++ gdm-2.24.0/gui/simple-greeter/gdm-greeter-login-window.c -@@ -1414,29 +1414,6 @@ on_user_unchosen (GdmUserChooserWidget +--- gdm-2.28.0.orig/gui/simple-greeter/gdm-greeter-login-window.c ++++ gdm-2.28.0/gui/simple-greeter/gdm-greeter-login-window.c +@@ -1199,29 +1199,6 @@ on_user_unchosen (GdmUserChooserWidget do_cancel (login_window); } @@ -32,7 +32,7 @@ Index: gdm-2.24.0/gui/simple-greeter/gdm-greeter-login-window.c static char * file_read_one_line (const char *filename) { -@@ -1529,9 +1506,12 @@ create_computer_info (GdmGreeterLoginWin +@@ -1314,9 +1291,12 @@ create_computer_info (GdmGreeterLoginWin label = glade_xml_get_widget (login_window->priv->xml, "computer-info-version-label"); if (label != NULL) { char *version; @@ -46,7 +46,7 @@ Index: gdm-2.24.0/gui/simple-greeter/gdm-greeter-login-window.c } gdm_profile_end (NULL); -@@ -1667,9 +1647,6 @@ load_theme (GdmGreeterLoginWindow *login +@@ -1455,9 +1435,6 @@ load_theme (GdmGreeterLoginWindow *login create_computer_info (login_window); @@ -56,508 +56,1546 @@ Index: gdm-2.24.0/gui/simple-greeter/gdm-greeter-login-window.c switch_mode (login_window, MODE_SELECTION); gdm_profile_end (NULL); -Index: gdm-2.24.0/gui/simple-greeter/gdm-greeter-login-window.glade +Index: gdm-2.28.0/gui/simple-greeter/gdm-greeter-login-window.glade =================================================================== ---- gdm-2.24.0.orig/gui/simple-greeter/gdm-greeter-login-window.glade -+++ gdm-2.24.0/gui/simple-greeter/gdm-greeter-login-window.glade -@@ -1,9 +1,7 @@ -- -- -- +--- gdm-2.28.0.orig/gui/simple-greeter/gdm-greeter-login-window.glade ++++ gdm-2.28.0/gui/simple-greeter/gdm-greeter-login-window.glade +@@ -1,789 +1,374 @@ +- +- +- + -+ - -- 400 - True - 12 - Authentication Dialog -@@ -13,100 +11,67 @@ - True - 10 - -- -+ - True -+ 12 - - - True -- 64 -+ 0 -+ 48 - computer - -+ -+ False -+ False -+ - -- -- -- False -- False -- -- -- -- -- False -- True -- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - -- -+ - True -- False -- False -+ 6 - -- -+ - True -- Computer Name -+ 0 -+ Version -+ True - - - -- -+ - True -- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK -- page 5 -+ 0 -+ Computer Name - - -- tab -- False -+ 1 - - - -- -+ - True -- Version -+ 6 -+ -+ -+ True -+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK -+ 0 -+ GTK_JUSTIFY_CENTER -+ True -+ -+ - - -- 1 -- -- -- -- -- -- tab -- -- -- -- -- -- -- -- -- tab -- -- -- -- -- -- -- -- -- tab -+ 2 - - - -+ -+ 1 -+ - - -- -- False -- False -- 1 -- -- -- -- -- True -- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK -- GTK_JUSTIFY_CENTER -- True -- -- -- 3 -- - - - -@@ -138,7 +103,7 @@ - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK -- • -+ • - True - - -@@ -189,7 +154,7 @@ - - - -- 5 -+ 1 - - - -Index: gdm-2.24.0/gui/simple-greeter/gdm-greeter-login-window.glade.new -=================================================================== ---- /dev/null -+++ gdm-2.24.0/gui/simple-greeter/gdm-greeter-login-window.glade.new -@@ -0,0 +1,334 @@ -+ -+ -+ +- +- +- 400 +- True +- Authentication Dialog +- GTK_WINDOW_TOPLEVEL +- GTK_WIN_POS_NONE +- False +- True +- False +- True +- False +- False +- GDK_WINDOW_TYPE_HINT_DIALOG +- GDK_GRAVITY_NORTH_WEST +- True +- False +- +- +- +- True +- 0 +- 0.5 +- GTK_SHADOW_OUT +- +- +- +- 24 +- True +- 0.5 +- 0.5 +- 1 +- 1 +- 0 +- 0 +- 0 +- 0 +- +- +- +- True +- False +- 10 +- +- +- +- True +- 0.5 +- 0.5 +- 1 +- 1 +- 0 +- 0 +- 0 +- 0 +- +- +- +- True +- computer +- 64 +- 0.5 +- 0.5 +- 0 +- 0 +- +- +- +- +- 0 +- False +- False +- +- +- +- +- +- True +- False +- False +- +- +- +- True +- False +- False +- GTK_POS_TOP +- False +- False +- +- +- +- True +- Computer Name +- False +- False +- GTK_JUSTIFY_LEFT +- False +- False +- 0.5 +- 0.5 +- 0 +- 0 +- PANGO_ELLIPSIZE_NONE +- -1 +- False +- 0 +- +- +- False +- True +- +- +- +- +- +- True +- page 5 +- False +- False +- GTK_JUSTIFY_LEFT +- False +- False +- 0.5 +- 0.5 +- 0 +- 0 +- PANGO_ELLIPSIZE_NONE +- -1 +- False +- 0 +- +- +- tab +- +- +- +- +- +- True +- Version +- False +- False +- GTK_JUSTIFY_LEFT +- False +- False +- 0.5 +- 0.5 +- 0 +- 0 +- PANGO_ELLIPSIZE_NONE +- -1 +- False +- 0 +- +- +- False +- True +- +- +- +- +- +- True +- +- False +- False +- GTK_JUSTIFY_LEFT +- False +- False +- 0.5 +- 0.5 +- 0 +- 0 +- PANGO_ELLIPSIZE_NONE +- -1 +- False +- 0 +- +- +- tab +- +- +- +- +- +- +- +- +- +- True +- +- False +- False +- GTK_JUSTIFY_LEFT +- False +- False +- 0.5 +- 0.5 +- 0 +- 0 +- PANGO_ELLIPSIZE_NONE +- -1 +- False +- 0 +- +- +- tab +- +- +- +- +- +- +- +- +- +- True +- +- False +- False +- GTK_JUSTIFY_LEFT +- False +- False +- 0.5 +- 0.5 +- 0 +- 0 +- PANGO_ELLIPSIZE_NONE +- -1 +- False +- 0 +- +- +- tab +- +- +- +- +- +- +- +- +- +- True +- +- False +- False +- GTK_JUSTIFY_LEFT +- False +- False +- 0.5 +- 0.5 +- 0 +- 0 +- PANGO_ELLIPSIZE_NONE +- -1 +- False +- 0 +- +- +- tab +- +- +- +- +- +- +- +- +- +- True +- +- False +- False +- GTK_JUSTIFY_LEFT +- False +- False +- 0.5 +- 0.5 +- 0 +- 0 +- PANGO_ELLIPSIZE_NONE +- -1 +- False +- 0 +- +- +- tab +- +- +- +- +- +- +- +- +- +- True +- +- False +- False +- GTK_JUSTIFY_LEFT +- False +- False +- 0.5 +- 0.5 +- 0 +- 0 +- PANGO_ELLIPSIZE_NONE +- -1 +- False +- 0 +- +- +- tab +- +- +- +- +- +- +- 0 +- False +- False +- +- +- +- +- +- True +- GTK_BUTTONBOX_END +- 6 +- +- +- +- True +- True +- gtk-disconnect +- True +- GTK_RELIEF_NORMAL +- True +- +- +- +- +- +- True +- True +- True +- True +- GTK_RELIEF_NORMAL +- True +- +- +- +- True +- False +- 0 +- +- +- +- True +- media-playback-pause +- 16 +- 0.5 +- 0.5 +- 0 +- 0 +- +- +- 0 +- True +- True +- +- +- +- +- +- True +- Suspend +- False +- False +- GTK_JUSTIFY_LEFT +- False +- False +- 0 +- 0.5 +- 0 +- 0 +- PANGO_ELLIPSIZE_NONE +- -1 +- False +- 0 +- +- +- 0 +- True +- True +- +- +- +- +- +- +- +- +- +- True +- True +- True +- True +- GTK_RELIEF_NORMAL +- True +- +- +- +- True +- False +- 0 +- +- +- +- True +- view-refresh +- 16 +- 0.5 +- 0.5 +- 0 +- 0 +- +- +- 0 +- True +- True +- +- +- +- +- +- True +- Restart +- False +- False +- GTK_JUSTIFY_LEFT +- False +- False +- 0 +- 0.5 +- 0 +- 0 +- PANGO_ELLIPSIZE_NONE +- -1 +- False +- 0 +- +- +- 0 +- True +- True +- +- +- +- +- +- +- +- +- +- True +- True +- True +- True +- GTK_RELIEF_NORMAL +- True +- +- +- +- True +- False +- 0 +- +- +- +- True +- system-shutdown +- 16 +- 0.5 +- 0.5 +- 0 +- 0 +- +- +- 0 +- True +- True +- +- +- +- +- +- True +- Shut Down +- False +- False +- GTK_JUSTIFY_LEFT +- False +- False +- 0.5 +- 0.5 +- 0 +- 0 +- PANGO_ELLIPSIZE_NONE +- -1 +- False +- 0 +- +- +- 0 +- True +- True +- +- +- +- +- +- +- +- +- +- True +- True +- gtk-cancel +- True +- GTK_RELIEF_NORMAL +- True +- +- +- +- +- +- True +- True +- True +- True +- GTK_RELIEF_NORMAL +- True +- +- +- +- True +- False +- 0 +- +- +- +- True +- go-home +- 16 +- 0.5 +- 0.5 +- 0 +- 0 +- +- +- 0 +- True +- True +- +- +- +- +- +- True +- Log In +- False +- False +- GTK_JUSTIFY_LEFT +- False +- False +- 0 +- 0.5 +- 0 +- 0 +- PANGO_ELLIPSIZE_NONE +- -1 +- False +- 0 +- +- +- 0 +- True +- True +- +- +- +- +- +- +- +- +- 0 +- False +- False +- GTK_PACK_END +- +- +- +- +- +- True +- +- False +- False +- GTK_JUSTIFY_CENTER +- True +- False +- 0.5 +- 0.5 +- 0 +- 0 +- PANGO_ELLIPSIZE_NONE +- -1 +- False +- 0 +- +- +- 0 +- True +- True +- +- +- +- +- +- True +- 0.5 +- 0.5 +- 1 +- 1 +- 0 +- 0 +- 0 +- 0 +- +- +- +- True +- False +- 10 +- +- +- +- True +- 0 +- 0 +- Tue, 18 Nov 2008 21:55:38 GMT +- +- +- 0 +- True +- True +- +- +- +- +- +- True +- False +- 6 +- +- +- +- True +- +- False +- False +- GTK_JUSTIFY_LEFT +- False +- False +- 0.5 +- 0.5 +- 0 +- 0 +- PANGO_ELLIPSIZE_NONE +- -1 +- False +- 0 +- +- +- 0 +- False +- False +- +- +- +- +- +- True +- True +- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK +- True +- True +- 0 +- +- True +- True +- +- +- 0 +- True +- True +- +- +- +- +- +- +- +- +- 0 +- False +- False +- +- +- +- +- +- True +- False +- 0 +- +- +- +- True +- +- False +- False +- GTK_JUSTIFY_LEFT +- False +- False +- 0.5 +- 0.5 +- 0 +- 0 +- PANGO_ELLIPSIZE_NONE +- -1 +- False +- 0 +- +- +- 0 +- True +- True +- +- +- +- +- 0 +- False +- False +- +- +- +- +- +- +- 0 +- True +- True +- +- +- +- +- +- +- +- +- +- +- +- +- +- ++ ++ + ++ 400 + True -+ 12 + Authentication Dialog -+ GDK_WINDOW_TYPE_HINT_DIALOG ++ dialog + -+ ++ + True -+ 10 -+ -+ -+ True -+ 12 -+ -+ -+ True -+ 0 -+ 48 -+ computer -+ -+ -+ False -+ False -+ -+ -+ -+ -+ True -+ 6 -+ -+ -+ True -+ 0 -+ Version -+ True -+ -+ -+ -+ -+ True -+ 0 -+ Computer Name -+ -+ -+ 1 -+ -+ -+ -+ -+ True -+ 6 -+ -+ -+ True -+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK -+ 0 -+ GTK_JUSTIFY_CENTER -+ True -+ -+ -+ -+ -+ 2 -+ -+ -+ -+ -+ 1 -+ -+ -+ -+ ++ 0 ++ out + + + True ++ 24 + -+ ++ + True ++ vertical + 10 + -+ ++ + True -+ -+ -+ -+ -+ True -+ 6 ++ 12 + -+ ++ + True ++ 0 ++ 48 ++ computer + + + False + False ++ 0 + + + -+ ++ + True -+ True -+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK -+ • -+ True ++ vertical ++ 6 ++ ++ ++ True ++ 0 ++ Version ++ ++ ++ 0 ++ ++ ++ ++ ++ True ++ 0 ++ Computer Name ++ ++ ++ 1 ++ ++ ++ ++ ++ True ++ ++ ++ True ++ 0 ++ center ++ True ++ ++ ++ ++ ++ False ++ False ++ 2 ++ ++ + + + 1 + + ++ ++ ++ 0 ++ ++ ++ ++ ++ True + -+ ++ ++ True ++ vertical ++ 10 ++ ++ ++ True ++ ++ ++ 0 ++ ++ ++ ++ ++ True ++ 6 ++ ++ ++ True ++ ++ ++ False ++ False ++ 0 ++ ++ ++ ++ ++ True ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ ● ++ True ++ ++ ++ 1 ++ ++ ++ ++ ++ ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ True ++ ++ ++ True ++ ++ ++ 0 ++ ++ ++ ++ ++ False ++ False ++ 2 ++ ++ ++ + + + -+ False -+ False + 1 + + + -+ ++ + True ++ 6 ++ end + -+ ++ ++ gtk-disconnect + True ++ True ++ True ++ True + ++ ++ False ++ False ++ 0 ++ ++ ++ ++ ++ True ++ True ++ True ++ True ++ True ++ ++ ++ True ++ ++ ++ True ++ 16 ++ media-playback-pause ++ ++ ++ 0 ++ ++ ++ ++ ++ True ++ 0 ++ Suspend ++ ++ ++ 1 ++ ++ ++ ++ ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ True ++ True ++ True ++ True ++ True ++ ++ ++ True ++ ++ ++ True ++ 16 ++ view-refresh ++ ++ ++ 0 ++ ++ ++ ++ ++ True ++ 0 ++ Restart ++ ++ ++ 1 ++ ++ ++ ++ ++ ++ ++ False ++ False ++ 2 ++ ++ ++ ++ ++ True ++ True ++ True ++ True ++ True ++ ++ ++ True ++ ++ ++ True ++ 16 ++ system-shutdown ++ ++ ++ 0 ++ ++ ++ ++ ++ True ++ Shut Down ++ ++ ++ 1 ++ ++ ++ ++ ++ ++ ++ False ++ False ++ 3 ++ ++ ++ ++ ++ gtk-cancel ++ True ++ True ++ True ++ True ++ ++ ++ False ++ False ++ 4 ++ ++ ++ ++ ++ True ++ True ++ True ++ True ++ True ++ ++ ++ True ++ ++ ++ True ++ 16 ++ go-home ++ ++ ++ 0 ++ ++ ++ ++ ++ True ++ 0 ++ Log In ++ ++ ++ 1 ++ ++ ++ ++ ++ ++ ++ False ++ False ++ 5 ++ + + + + False + False ++ end + 2 + + ++ ++ ++ ++ ++ ++ ++ + +Index: gdm-2.28.0/gui/simple-greeter/gdm-greeter-login-window.glade.new +=================================================================== +--- /dev/null ++++ gdm-2.28.0/gui/simple-greeter/gdm-greeter-login-window.glade.new +@@ -0,0 +1,374 @@ ++ ++ ++ ++ ++ ++ 400 ++ True ++ Authentication Dialog ++ dialog ++ ++ ++ True ++ 0 ++ out ++ ++ ++ True ++ 24 ++ ++ ++ True ++ vertical ++ 10 + -+ ++ ++ True ++ 12 ++ ++ ++ True ++ 0 ++ 48 ++ computer ++ ++ ++ False ++ False ++ 0 ++ ++ ++ ++ ++ True ++ vertical ++ 6 ++ ++ ++ True ++ 0 ++ Version ++ ++ ++ 0 ++ ++ ++ ++ ++ True ++ 0 ++ Computer Name ++ ++ ++ 1 ++ ++ ++ ++ ++ True ++ ++ ++ True ++ 0 ++ center ++ True ++ ++ ++ ++ ++ False ++ False ++ 2 ++ ++ ++ ++ ++ 1 ++ ++ ++ ++ ++ 0 ++ ++ ++ ++ + True + -+ ++ + True ++ vertical ++ 10 ++ ++ ++ True ++ ++ ++ 0 ++ ++ ++ ++ ++ True ++ 6 ++ ++ ++ True ++ ++ ++ False ++ False ++ 0 ++ ++ ++ ++ ++ True ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ ● ++ True ++ ++ ++ 1 ++ ++ ++ ++ ++ ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ True ++ ++ ++ True ++ ++ ++ 0 ++ ++ ++ ++ ++ False ++ False ++ 2 ++ ++ + + + + ++ 1 ++ ++ ++ ++ ++ True ++ 6 ++ end ++ ++ ++ gtk-disconnect ++ True ++ True ++ True ++ True ++ ++ ++ False ++ False ++ 0 ++ ++ ++ ++ ++ True ++ True ++ True ++ True ++ True ++ ++ ++ True ++ ++ ++ True ++ 16 ++ media-playback-pause ++ ++ ++ 0 ++ ++ ++ ++ ++ True ++ 0 ++ Suspend ++ ++ ++ 1 ++ ++ ++ ++ ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ True ++ True ++ True ++ True ++ True ++ ++ ++ True ++ ++ ++ True ++ 16 ++ view-refresh ++ ++ ++ 0 ++ ++ ++ ++ ++ True ++ 0 ++ Restart ++ ++ ++ 1 ++ ++ ++ ++ ++ ++ ++ False ++ False ++ 2 ++ ++ ++ ++ ++ True ++ True ++ True ++ True ++ True ++ ++ ++ True ++ ++ ++ True ++ 16 ++ system-shutdown ++ ++ ++ 0 ++ ++ ++ ++ ++ True ++ Shut Down ++ ++ ++ 1 ++ ++ ++ ++ ++ ++ ++ False ++ False ++ 3 ++ ++ ++ ++ ++ gtk-cancel ++ True ++ True ++ True ++ True ++ ++ ++ False ++ False ++ 4 ++ ++ ++ ++ ++ True ++ True ++ True ++ True ++ True ++ ++ ++ True ++ ++ ++ True ++ 16 ++ go-home ++ ++ ++ 0 ++ ++ ++ ++ ++ True ++ 0 ++ Log In ++ ++ ++ 1 ++ ++ ++ ++ ++ ++ ++ False ++ False ++ 5 ++ ++ ++ ++ + False + False -+ 3 ++ end ++ 2 + + + + + -+ -+ 1 -+ -+ -+ -+ -+ True -+ 6 -+ GTK_BUTTONBOX_END -+ -+ -+ True -+ True -+ True -+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK -+ gtk-disconnect -+ True -+ 0 -+ -+ -+ -+ -+ True -+ True -+ True -+ True -+ 0 -+ -+ -+ True -+ -+ -+ True -+ 16 -+ media-playback-pause -+ -+ -+ -+ -+ True -+ 0 -+ Suspend -+ -+ -+ 1 -+ -+ -+ -+ -+ -+ -+ 1 -+ -+ -+ -+ -+ True -+ True -+ True -+ True -+ 0 -+ -+ -+ True -+ -+ -+ True -+ 16 -+ view-refresh -+ -+ -+ -+ -+ True -+ 0 -+ Restart -+ -+ -+ 1 -+ -+ -+ -+ -+ -+ -+ 2 -+ -+ -+ -+ -+ True -+ True -+ True -+ True -+ 0 -+ -+ -+ True -+ -+ -+ True -+ 16 -+ system-shutdown -+ -+ -+ -+ -+ True -+ Shut Down -+ -+ -+ 1 -+ -+ -+ -+ -+ -+ -+ 3 -+ -+ -+ -+ -+ True -+ True -+ gtk-cancel -+ True -+ 0 -+ -+ -+ 4 -+ -+ -+ -+ -+ True -+ True -+ True -+ True -+ 0 -+ -+ -+ True -+ -+ -+ True -+ 16 -+ go-home -+ -+ -+ -+ -+ True -+ 0 -+ Log In -+ -+ -+ 1 -+ -+ -+ -+ -+ -+ -+ 5 -+ -+ -+ -+ -+ False -+ False -+ GTK_PACK_END -+ 2 -+ + + + diff --git a/gdm-polkit-gnome-path.patch b/gdm-polkit-gnome-path.patch new file mode 100644 index 0000000..6df8da4 --- /dev/null +++ b/gdm-polkit-gnome-path.patch @@ -0,0 +1,11 @@ +Index: gdm-2.28.0/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in +=================================================================== +--- gdm-2.28.0.orig/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in ++++ gdm-2.28.0/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in +@@ -1,5 +1,5 @@ + [Desktop Entry] + Type=Application + _Name=PolicyKit Authentication Agent +-Exec=/usr/libexec/polkit-gnome-authentication-agent-1 ++Exec=/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 + OnlyShowIn=GNOME; diff --git a/gdm.changes b/gdm.changes index 0aa326a..fc4c00c 100644 --- a/gdm.changes +++ b/gdm.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Fri Oct 2 19:33:46 CEST 2009 - vuntz@opensuse.org + +- Add gdm-devkit-power.patch: gdm was using a dbus API which + doesn't exist anymore, and the right way to handle this is to use + DeviceKit-power. +- Add DeviceKit-power-devel BuildRequires for the patch. +- Add gdm-polkit-gnome-path.patch to use the correct path for the + polkit agent. +- Rebase gdm-greeter-greater-ui.patch. Fix bnc#533597. + ------------------------------------------------------------------- Fri Oct 2 17:25:38 CEST 2009 - vuntz@opensuse.org diff --git a/gdm.spec b/gdm.spec index e1ee1de..bc9fa5d 100644 --- a/gdm.spec +++ b/gdm.spec @@ -19,6 +19,7 @@ Name: gdm +BuildRequires: DeviceKit-power-devel BuildRequires: check-devel BuildRequires: fdupes BuildRequires: gconf2-devel @@ -64,7 +65,7 @@ Patch7: gdm-suse-xsession.patch Patch8: gdm-domain-logon.patch # PATCH-FIX-OPENSUSE gdm-sysconfig-settings.patch bnc432360 hpj@novell.com -- Read autologin options from /etc/sysconfig/displaymanager Patch13: gdm-sysconfig-settings.patch -# PATCH-NEEDS-REBASE gdm-greeter-greater-ui.patch bnc436431 bgo560508 vuntz@novell.com -- Improve the layout of the greeter. Note: the patch contains a patched glade file *and* the result glade file (for reference only, in case we need to rebase the patch) (was PATCH-FIX-UPSTREAM) +# PATCH-FIX-UPSTREAM gdm-greeter-greater-ui.patch bnc436431 bgo560508 vuntz@novell.com -- Improve the layout of the greeter. Note: the patch contains a patched glade file *and* the result glade file (for reference only, in case we need to rebase the patch) Patch15: gdm-greeter-greater-ui.patch # PATCH-FIX-UPSTREAM gdm-always-reflect-keyboard-layout.patch bnc438159 bgo561771 hpj@novell.com -- Make keyboard selector not neglect to apply the selected keyboard in some situations. Patch18: gdm-always-reflect-keyboard-layout.patch @@ -86,6 +87,10 @@ Patch35: gdm-xauthlocalhostname.patch Patch36: gdm-build-fixes.patch # PATCH-FIX-UPSTREAM gdm-autologin-once.patch bgo587606 vuntz@novell.com -- Make autologin work only once Patch37: gdm-autologin-once.patch +# PATCH-FIX-UPSTREAM gdm-devkit-power.patch bgo596569 vuntz@opensuse.org -- Use devkit-power instead of non-existing dbus API, patch from upstream +Patch38: gdm-devkit-power.patch +# PATCH-FIX-UPSTREAM gdm-polkit-gnome-path.patch bgo597050 vuntz@opensuse.org -- Use the right patch for the polkit agent. The current patch is a quick workaround for now, until we know how upstream wants to fix this. +Patch39: gdm-polkit-gnome-path.patch # PATCH-FIX-OPENSUSE gdm-selinux.patch -- Small changes to make it compile fine with SELinux Patch60: gdm-selinux.patch Url: http://www.gnome.org/ @@ -144,7 +149,7 @@ gnome-patch-translation-prepare # NEEDS-REBASE - also re-enable gnome-patch-translation-update after patch rebase # %%patch8 -p1 %patch13 -p1 -# %%patch15 -p1 +%patch15 -p1 %patch18 -p1 %patch19 -p1 %patch20 -p1 @@ -158,6 +163,8 @@ gnome-patch-translation-prepare %patch35 -p1 %patch36 -p1 %patch37 -p1 +%patch38 -p1 +%patch39 -p1 %patch60 # gnome-patch-translation-update