summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Granseuer <jensgr@gmx.net>2007-08-12 14:11:11 +0000
committerJens Granseuer <jensg@src.gnome.org>2007-08-12 14:11:11 +0000
commit7925a93a005612929eaa57ef1a5af0dc0c2522c3 (patch)
treebad94bf088ef0aef4fb77f21f252a0fb7c538b33
parentbf00b15d13ad695d51d759a9329e8bc8d1ae2fbd (diff)
downloadgnome-control-center-7925a93a005612929eaa57ef1a5af0dc0c2522c3.tar.gz
expose missing metacity double-click actions. Closes bug #416541.
2007-08-12 Jens Granseuer <jensgr@gmx.net> * metacity-window-manager.c: (metacity_change_settings), (metacity_get_settings), (metacity_get_double_click_actions): expose missing metacity double-click actions. Closes bug #416541. svn path=/trunk/; revision=7989
-rw-r--r--libwindow-settings/ChangeLog6
-rw-r--r--libwindow-settings/metacity-window-manager.c18
2 files changed, 22 insertions, 2 deletions
diff --git a/libwindow-settings/ChangeLog b/libwindow-settings/ChangeLog
index b227fb5f4..0a39622a2 100644
--- a/libwindow-settings/ChangeLog
+++ b/libwindow-settings/ChangeLog
@@ -1,3 +1,9 @@
+2007-08-12 Jens Granseuer <jensgr@gmx.net>
+
+ * metacity-window-manager.c: (metacity_change_settings),
+ (metacity_get_settings), (metacity_get_double_click_actions):
+ expose missing metacity double-click actions. Closes bug #416541.
+
2007-03-05 Jens Granseuer <jensgr@gmx.net>
Patch by: Loic Minier <lool+gnome@via.ecp.fr>
diff --git a/libwindow-settings/metacity-window-manager.c b/libwindow-settings/metacity-window-manager.c
index bba39795a..0511bc400 100644
--- a/libwindow-settings/metacity-window-manager.c
+++ b/libwindow-settings/metacity-window-manager.c
@@ -44,7 +44,9 @@
enum
{
DOUBLE_CLICK_MAXIMIZE,
- DOUBLE_CLICK_SHADE
+ DOUBLE_CLICK_MINIMIZE,
+ DOUBLE_CLICK_SHADE,
+ DOUBLE_CLICK_NONE
};
static GnomeWindowManagerClass *parent_class;
@@ -209,6 +211,12 @@ metacity_change_settings (GnomeWindowManager *wm,
case DOUBLE_CLICK_MAXIMIZE:
action = "toggle_maximize";
break;
+ case DOUBLE_CLICK_MINIMIZE:
+ action = "minimize";
+ break;
+ case DOUBLE_CLICK_NONE:
+ action = "none";
+ break;
}
if (action != NULL) {
@@ -354,6 +362,10 @@ metacity_get_settings (GnomeWindowManager *wm,
settings->double_click_action = DOUBLE_CLICK_SHADE;
else if (strcmp (str, "toggle_maximize") == 0)
settings->double_click_action = DOUBLE_CLICK_MAXIMIZE;
+ else if (strcmp (str, "minimize") == 0)
+ settings->double_click_action = DOUBLE_CLICK_MINIMIZE;
+ else if (strcmp (str, "none") == 0)
+ settings->double_click_action = DOUBLE_CLICK_NONE;
else
settings->double_click_action = DOUBLE_CLICK_SHADE;
@@ -376,7 +388,9 @@ metacity_get_double_click_actions (GnomeWindowManager *wm,
{
static GnomeWMDoubleClickAction actions[] = {
{ DOUBLE_CLICK_MAXIMIZE, N_("Maximize") },
- { DOUBLE_CLICK_SHADE, N_("Roll up") }
+ { DOUBLE_CLICK_MINIMIZE, N_("Minimize") },
+ { DOUBLE_CLICK_SHADE, N_("Roll up") },
+ { DOUBLE_CLICK_NONE, N_("None") }
};
static gboolean initialized = FALSE;