HGKeeper

propagate from branch 'im.pidgin.pidgin' (head bf0e2a6f6cae822b80566d6a7873059355b6372d)
next.minor
2008-05-07, Evan Schoenberg

a041a32a5521

Parents aa5be60292de bf0e2a6f6cae
Children b5f4549fb649

propagate from branch 'im.pidgin.pidgin' (head bf0e2a6f6cae822b80566d6a7873059355b6372d)
to branch 'im.pidgin.pidgin.next.minor' (head aa5be60292de35d0338170de96b47aa0ab4c96f0)

2 files changed, 4 insertions(+), 1 deletions(-)

+1 -0

gntwidget.c

+3 -1

gntwm.c

~~--- a/gntwidget.c Mon Apr 28 22:34:39 2008 +0000~~

+++ b/gntwidget.c Wed May 07 12:14:28 2008 +0000

@@ -257,6 +257,7 @@

gnt_bindable_class_register_action(GNT_BINDABLE_CLASS(klass), "context-menu", context_menu,

GNT_KEY_POPUP, NULL);

gnt_bindable_register_binding(GNT_BINDABLE_CLASS(klass), "context-menu", GNT_KEY_F11, NULL);

+ gnt_bindable_register_binding(GNT_BINDABLE_CLASS(klass), "context-menu", GNT_KEY_CTRL_X, NULL);

gnt_style_read_actions(G_OBJECT_CLASS_TYPE(klass), GNT_BINDABLE_CLASS(klass));

GNTDEBUG;

~~--- a/gntwm.c Mon Apr 28 22:34:39 2008 +0000~~

+++ b/gntwm.c Wed May 07 12:14:28 2008 +0000

@@ -101,7 +101,9 @@

static gboolean idle_update;

static GList *act = NULL; /* list of WS with unseen activitiy */

static gboolean ignore_keys = FALSE;

+#ifdef USE_PYTHON

static gboolean started_python = FALSE;

+#endif

static GList *

g_list_bring_to_front(GList *list, gpointer data)

@@ -1516,7 +1518,7 @@

gnt_bindable_class_register_action(GNT_BINDABLE_CLASS(klass), "help-for-window", help_for_window,

"\033" "|", NULL);

gnt_bindable_class_register_action(GNT_BINDABLE_CLASS(klass), "ignore-keys-start", ignore_keys_start,

~~- GNT_KEY_CTRL_G, NULL);~~

+ NULL, NULL);

gnt_bindable_class_register_action(GNT_BINDABLE_CLASS(klass), "ignore-keys-end", ignore_keys_end,

"\033" GNT_KEY_CTRL_G, NULL);

gnt_bindable_class_register_action(GNT_BINDABLE_CLASS(klass), "window-next-urgent", window_next_urgent,

qulogic/libgnt