[gnome-panel] Partially revert commit c96e85f3
- From: Alberts Muktupāvels <muktupavels src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-panel] Partially revert commit c96e85f3
- Date: Mon, 2 Jun 2014 20:10:27 +0000 (UTC)
commit 0bef2bea5c11799ac98a9ba823d6a68cd09eb46e
Author: Sebastian Geiger <sbastig gmx net>
Date: Sun Jun 1 21:21:18 2014 +0200
Partially revert commit c96e85f3
* This commit partially reverts commit
c96e85f3dfe8eb4f524a59f4683197dfe9539d2e
which introduced ABI incompatible changes.
* These changes can be restored after 3.8.1
is released.
libpanel-applet/panel-applet-bindings.c | 8 +++++---
libpanel-applet/panel-applet-bindings.h | 4 ++++
2 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/libpanel-applet/panel-applet-bindings.c b/libpanel-applet/panel-applet-bindings.c
index ecbb835..843e502 100644
--- a/libpanel-applet/panel-applet-bindings.c
+++ b/libpanel-applet/panel-applet-bindings.c
@@ -159,8 +159,10 @@ panel_bindings_mouse_modifier_changed (GSettings *settings, const gchar *key)
panel_bindings_mouse_modifier_set_from_string (g_settings_get_string (settings, key));
}
-static void
-panel_applet_bindings_init (void)
+void panel_applet_bindings_clean (GConfClient *client) {}
+
+void
+panel_applet_bindings_init (GConfClient *client)
{
char *str;
@@ -189,7 +191,7 @@ panel_applet_bindings_get_mouse_button_modifier_keymask (void)
g_assert (mouse_button_modifier_keymask != 0);
if (!initialised)
- panel_applet_bindings_init ();
+ panel_applet_bindings_init (NULL);
mod = panel_applet_bindings_get_real_modifier_mask (mouse_button_modifier_keymask);
diff --git a/libpanel-applet/panel-applet-bindings.h b/libpanel-applet/panel-applet-bindings.h
index 262d9bf..d5f15bc 100644
--- a/libpanel-applet/panel-applet-bindings.h
+++ b/libpanel-applet/panel-applet-bindings.h
@@ -25,9 +25,13 @@
#include <glib.h>
#include <gdk/gdk.h>
+#include <gconf/gconf-client.h>
G_BEGIN_DECLS
+void panel_applet_bindings_init (GConfClient *client);
+void panel_applet_bindings_clean (GConfClient *client);
+
guint panel_applet_bindings_get_mouse_button_modifier_keymask (void);
void panel_applet_bindings_key_event_is_popup (GdkEventKey *event,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]