rpms/gnome-session
7
0
Fork 0
Code Issues Pull Requests Releases Activity

fix some problems with the PolicyKit port

Browse Source
This commit is contained in:
Matthias Clasen 2009-06-13 00:15:24 +00:00
parent 6d4aa54f85
commit cdd8aebbb9
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gnome-session.spec
View File

@ -10,7 +10,7 @@
Summary: GNOME session manager Summary: GNOME session manager
Name: gnome-session Name: gnome-session
Version: 2.26.1 Version: 2.26.1
Release: 2%{?dist} Release: 3%{?dist}
URL: http://www.gnome.org URL: http://www.gnome.org
Source0: http://download.gnome.org/sources/gnome-session/2.26/%{name}-%{version}.tar.bz2 Source0: http://download.gnome.org/sources/gnome-session/2.26/%{name}-%{version}.tar.bz2
Source1: redhat-default-session Source1: redhat-default-session
@ -177,6 +177,9 @@ fi
%changelog %changelog
* Fri Jun 12 2009 Matthias Clasen <mclasen@redhat.com> - 2.26.1-3
- Fix some oversights in the PolicyKit port
* Tue May 12 2009 Matthias Clasen <mclasen@redhat.com> - 2.26.1-2 * Tue May 12 2009 Matthias Clasen <mclasen@redhat.com> - 2.26.1-2
- Port to PolicyKit 1 - Port to PolicyKit 1

10
polkit1.patch
View File

@ -1,6 +1,6 @@
diff -up gnome-session-2.26.1/configure.in.polkit1 gnome-session-2.26.1/configure.in diff -up gnome-session-2.26.1/configure.in.polkit1 gnome-session-2.26.1/configure.in
--- gnome-session-2.26.1/configure.in.polkit1 2009-04-14 11:31:47.000000000 -0400 --- gnome-session-2.26.1/configure.in.polkit1 2009-04-14 11:31:47.000000000 -0400
+++ gnome-session-2.26.1/configure.in 2009-05-14 10:34:17.929350281 -0400 +++ gnome-session-2.26.1/configure.in 2009-06-12 19:51:49.223577026 -0400
@@ -31,7 +31,7 @@ AC_ARG_WITH(at-spi-registryd-directory, @@ -31,7 +31,7 @@ AC_ARG_WITH(at-spi-registryd-directory,
AT_SPI_REGISTRYD_DIR=$with_at_spi_registryd_directory AT_SPI_REGISTRYD_DIR=$with_at_spi_registryd_directory
AC_SUBST(AT_SPI_REGISTRYD_DIR) AC_SUBST(AT_SPI_REGISTRYD_DIR)
@ -42,7 +42,7 @@ diff -up gnome-session-2.26.1/configure.in.polkit1 gnome-session-2.26.1/configur
dnl GConf Checks dnl GConf Checks
diff -up gnome-session-2.26.1/gnome-session/gsm-consolekit.c.polkit1 gnome-session-2.26.1/gnome-session/gsm-consolekit.c diff -up gnome-session-2.26.1/gnome-session/gsm-consolekit.c.polkit1 gnome-session-2.26.1/gnome-session/gsm-consolekit.c
--- gnome-session-2.26.1/gnome-session/gsm-consolekit.c.polkit1 2009-04-14 11:31:45.000000000 -0400 --- gnome-session-2.26.1/gnome-session/gsm-consolekit.c.polkit1 2009-04-14 11:31:45.000000000 -0400
+++ gnome-session-2.26.1/gnome-session/gsm-consolekit.c 2009-05-13 23:47:00.667014605 -0400 +++ gnome-session-2.26.1/gnome-session/gsm-consolekit.c 2009-06-12 19:57:53.643580353 -0400
@@ -31,10 +31,6 @@ @@ -31,10 +31,6 @@
#include <dbus/dbus-glib.h> #include <dbus/dbus-glib.h>
#include <dbus/dbus-glib-lowlevel.h> #include <dbus/dbus-glib-lowlevel.h>
@ -494,7 +494,7 @@ diff -up gnome-session-2.26.1/gnome-session/gsm-consolekit.c.polkit1 gnome-sessi
G_TYPE_INVALID, G_TYPE_INVALID,
- /* return values: */ - /* return values: */
- G_TYPE_STRING, &type, - G_TYPE_STRING, &type,
+ &can_restart, + G_TYPE_BOOLEAN, &can_restart,
G_TYPE_INVALID); G_TYPE_INVALID);
- /* error is bad: we consider there's another user */ - /* error is bad: we consider there's another user */
@ -723,7 +723,7 @@ diff -up gnome-session-2.26.1/gnome-session/gsm-consolekit.c.polkit1 gnome-sessi
+ INT_MAX, + INT_MAX,
+ error, + error,
+ G_TYPE_INVALID, + G_TYPE_INVALID,
+ &can_stop, + G_TYPE_BOOLEAN, &can_stop,
+ G_TYPE_INVALID); + G_TYPE_INVALID);
-gboolean -gboolean
@ -742,7 +742,7 @@ diff -up gnome-session-2.26.1/gnome-session/gsm-consolekit.c.polkit1 gnome-sessi
gchar * gchar *
diff -up gnome-session-2.26.1/gnome-session/Makefile.am.polkit1 gnome-session-2.26.1/gnome-session/Makefile.am diff -up gnome-session-2.26.1/gnome-session/Makefile.am.polkit1 gnome-session-2.26.1/gnome-session/Makefile.am
--- gnome-session-2.26.1/gnome-session/Makefile.am.polkit1 2009-04-14 11:31:45.000000000 -0400 --- gnome-session-2.26.1/gnome-session/Makefile.am.polkit1 2009-04-14 11:31:45.000000000 -0400
+++ gnome-session-2.26.1/gnome-session/Makefile.am 2009-05-14 10:34:41.744457421 -0400 +++ gnome-session-2.26.1/gnome-session/Makefile.am 2009-06-12 19:51:49.228578549 -0400
@@ -16,7 +16,6 @@ INCLUDES = \ @@ -16,7 +16,6 @@ INCLUDES = \
$(ICE_CFLAGS) \ $(ICE_CFLAGS) \
$(GNOME_SESSION_CFLAGS) \ $(GNOME_SESSION_CFLAGS) \