[Libreoffice-commits] .: patches/dev300
Michael Meeks
mmeeks at kemper.freedesktop.org
Thu Oct 14 05:07:02 PDT 2010
patches/dev300/apply | 7 -
patches/dev300/arm-vis.diff | 13 --
patches/dev300/gnome-screen-saver.diff | 168 ---------------------------------
3 files changed, 188 deletions(-)
New commits:
commit b07d24cd7f48e1af58ee81600cd85fe99fcfe169
Author: Michael Meeks <michael.meeks at novell.com>
Date: Thu Oct 14 12:55:42 2010 +0100
remove obsolete screensaver and arm patches
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 4cda01d..06d52c7 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -47,7 +47,6 @@ Piece : PieceBits
#Localize
Localize : LocalizeFixes
UnstableWP : UnstableLibwpd
-Gnome2-26 : GnomeSessionManagement
# Novell
NovellBase : LinuxCommon, NovellOnly, NovellOnlyUnix, \
@@ -2192,18 +2191,15 @@ ubuntu-gnome-fpicker-gfile-fuse.diff, ccheney
[ UbuntuKarmicOnly ]
# Add patch to force use of gvfs fuse path needed when gnome-vfs/gio is disabled
ubuntu-gnome-fpicker-gfile-fuse.diff, ccheney
-arm-vis.diff, cmc
[ UbuntuLucidOnly ]
# Add patch to force use of gvfs fuse path needed when gnome-vfs/gio is disabled
ubuntu-gnome-fpicker-gfile-fuse.diff, ccheney
-arm-vis.diff, cmc
ubuntu-arm-thumb.diff, doko
[ UbuntuMaverickOnly ]
# Add patch to force use of gvfs fuse path needed when gnome-vfs/gio is disabled
ubuntu-gnome-fpicker-gfile-fuse.diff, ccheney
-arm-vis.diff, cmc
ubuntu-arm-thumb.diff, doko
[ Fixes ]
@@ -2329,9 +2325,6 @@ solenv-unpack-oxt.diff, pmladek
# link with -lcolamd, needed because our liblpsolve55{,_pic}.a doesn't include it
system-lpsolve-link-with-colamd.diff, rengelha
-[ GnomeSessionManagement ]
-gnome-screen-saver.diff, i#106372, cmc
-
[ OOXMLExport ]
oox-pptx-export-update-to-ooo320.diff, rodo
iso-ooxml-sw.diff, cbosdo
diff --git a/patches/dev300/arm-vis.diff b/patches/dev300/arm-vis.diff
deleted file mode 100644
index 15a834d..0000000
--- a/patches/dev300/arm-vis.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: configure.in
-===================================================================
---- configure.in (revision 276718)
-+++ configure.in (working copy)
-@@ -2710,7 +2710,7 @@
- if ! $CXX $CXXFLAGS $CPPFLAGS -fpic -S visibility.cxx 2>/dev/null > /dev/null; then
- gccvisbroken=yes
- else
-- if $EGREP -q '@PLT|\$stub' visibility.s; then
-+ if $EGREP -q '@PLT|\$stub|\(PLT\)' visibility.s; then
- gccvisbroken=no;
- else
- gccvisbroken=yes;
diff --git a/patches/dev300/gnome-screen-saver.diff b/patches/dev300/gnome-screen-saver.diff
deleted file mode 100644
index f701b29..0000000
--- a/patches/dev300/gnome-screen-saver.diff
+++ /dev/null
@@ -1,168 +0,0 @@
-Gnome session management patch from Caolan
-
-From: Thorsten Behrens <thb at openoffice.org>
-
-
----
-
- vcl/unx/gtk/window/gtkframe.cxx | 51 ++++++++++++++++++----------------
- vcl/unx/inc/plugins/gtk/gtkframe.hxx | 2 +
- 2 files changed, 28 insertions(+), 25 deletions(-)
-
-
-diff --git vcl/unx/gtk/window/gtkframe.cxx vcl/unx/gtk/window/gtkframe.cxx
-index 7f0417e..707be14 100644
---- vcl/unx/gtk/window/gtkframe.cxx
-+++ vcl/unx/gtk/window/gtkframe.cxx
-@@ -70,9 +70,9 @@
- #ifdef ENABLE_DBUS
- #include <dbus/dbus-glib.h>
-
--#define GSS_DBUS_SERVICE "org.gnome.ScreenSaver"
--#define GSS_DBUS_PATH "/org/gnome/ScreenSaver"
--#define GSS_DBUS_INTERFACE "org.gnome.ScreenSaver"
-+#define GSM_DBUS_SERVICE "org.gnome.SessionManager"
-+#define GSM_DBUS_PATH "/org/gnome/SessionManager"
-+#define GSM_DBUS_INTERFACE "org.gnome.SessionManager"
- #endif
-
- // make compile on gtk older than 2.10
-@@ -567,7 +567,7 @@ void GtkSalFrame::InitCommon()
- m_pIMHandler = NULL;
- m_hBackgroundPixmap = None;
- m_nSavedScreenSaverTimeout = 0;
-- m_nGSSCookie = 0;
-+ m_nGSMCookie = 0;
- m_nExtStyle = 0;
- m_pRegion = NULL;
- m_ePointerStyle = 0xffff;
-@@ -1912,8 +1912,9 @@ void GtkSalFrame::setAutoLock( bool bLock )
- #ifdef ENABLE_DBUS
- /** cookie is returned as an unsigned integer */
- static guint
--dbus_inhibit_gss (const gchar *appname,
-- const gchar *reason)
-+dbus_inhibit_gsm (const gchar *appname,
-+ const gchar *reason,
-+ guint xid)
- {
- gboolean res;
- guint cookie;
-@@ -1929,20 +1930,22 @@ dbus_inhibit_gss (const gchar *appname,
- return -1;
- }
-
-- /* get the proxy with gnome-screensaver */
-+ /* get the proxy with gnome-session-manager */
- proxy = dbus_g_proxy_new_for_name (session_connection,
-- GSS_DBUS_SERVICE,
-- GSS_DBUS_PATH,
-- GSS_DBUS_INTERFACE);
-+ GSM_DBUS_SERVICE,
-+ GSM_DBUS_PATH,
-+ GSM_DBUS_INTERFACE);
- if (proxy == NULL) {
-- g_warning ("Could not get DBUS proxy: %s", GSS_DBUS_SERVICE);
-+ g_warning ("Could not get DBUS proxy: %s", GSM_DBUS_SERVICE);
- return -1;
- }
-
- res = dbus_g_proxy_call (proxy,
- "Inhibit", &error,
- G_TYPE_STRING, appname,
-+ G_TYPE_UINT, xid,
- G_TYPE_STRING, reason,
-+ G_TYPE_UINT, 8, //Inhibit the session being marked as idle
- G_TYPE_INVALID,
- G_TYPE_UINT, &cookie,
- G_TYPE_INVALID);
-@@ -1965,15 +1968,14 @@ dbus_inhibit_gss (const gchar *appname,
- }
-
- static void
--dbus_uninhibit_gss (guint cookie)
-+dbus_uninhibit_gsm (guint cookie)
- {
- gboolean res;
- GError *error = NULL;
- DBusGProxy *proxy = NULL;
- DBusGConnection *session_connection = NULL;
-
-- /* cookies have to be positive as unsigned */
-- if (cookie < 0) {
-+ if (cookie == guint(-1)) {
- g_warning ("Invalid cookie");
- return;
- }
-@@ -1986,18 +1988,18 @@ dbus_uninhibit_gss (guint cookie)
- return;
- }
-
-- /* get the proxy with gnome-screensaver */
-+ /* get the proxy with gnome-session-manager */
- proxy = dbus_g_proxy_new_for_name (session_connection,
-- GSS_DBUS_SERVICE,
-- GSS_DBUS_PATH,
-- GSS_DBUS_INTERFACE);
-+ GSM_DBUS_SERVICE,
-+ GSM_DBUS_PATH,
-+ GSM_DBUS_INTERFACE);
- if (proxy == NULL) {
-- g_warning ("Could not get DBUS proxy: %s", GSS_DBUS_SERVICE);
-+ g_warning ("Could not get DBUS proxy: %s", GSM_DBUS_SERVICE);
- return;
- }
-
- res = dbus_g_proxy_call (proxy,
-- "UnInhibit",
-+ "Uninhibit",
- &error,
- G_TYPE_UINT, cookie,
- G_TYPE_INVALID,
-@@ -2005,12 +2007,12 @@ dbus_uninhibit_gss (guint cookie)
-
- /* check the return value */
- if (! res) {
-- g_warning ("UnInhibit method failed");
-+ g_warning ("Uninhibit method failed");
- }
-
- /* check the error value */
- if (error != NULL) {
-- g_warning ("Inhibit problem : %s", error->message);
-+ g_warning ("Uninhibit problem : %s", error->message);
- g_error_free (error);
- cookie = -1;
- }
-@@ -2038,7 +2040,8 @@ void GtkSalFrame::StartPresentation( BOOL bStart )
- bPreferBlanking, bAllowExposures );
- }
- #ifdef ENABLE_DBUS
-- m_nGSSCookie = dbus_inhibit_gss(g_get_application_name(), "presentation");
-+ m_nGSMCookie = dbus_inhibit_gsm(g_get_application_name(), "presentation",
-+ GDK_WINDOW_XID(m_pWindow->window));
- #endif
- }
- else
-@@ -2049,7 +2052,7 @@ void GtkSalFrame::StartPresentation( BOOL bStart )
- bAllowExposures );
- m_nSavedScreenSaverTimeout = 0;
- #ifdef ENABLE_DBUS
-- dbus_uninhibit_gss(m_nGSSCookie);
-+ dbus_uninhibit_gsm(m_nGSMCookie);
- #endif
- }
- }
-diff --git vcl/unx/inc/plugins/gtk/gtkframe.hxx vcl/unx/inc/plugins/gtk/gtkframe.hxx
-index afd258b..990a515 100644
---- vcl/unx/inc/plugins/gtk/gtkframe.hxx
-+++ vcl/unx/inc/plugins/gtk/gtkframe.hxx
-@@ -180,7 +180,7 @@ class GtkSalFrame : public SalFrame
- GdkVisibilityState m_nVisibility;
- PointerStyle m_ePointerStyle;
- int m_nSavedScreenSaverTimeout;
-- guint m_nGSSCookie;
-+ guint m_nGSMCookie;
- int m_nWorkArea;
- bool m_bFullscreen;
- bool m_bSingleAltPress;
More information about the Libreoffice-commits
mailing list