changeset 30601:fc8f98d1e81f

merge of '2e94598029dc6350d656fd335ad83738ff0c8e29' and '5e3707fd727a9e7f1d26a84dbf06be284072fd1f'
author Marcus Lundblad <ml@update.uu.se>
date Thu, 10 Jun 2010 20:35:08 +0000
parents 8cb39e235f39 (current diff) 2a51b2c643d2 (diff)
children 27aff21c5eea
files ChangeLog
diffstat 4 files changed, 35 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Jun 10 19:54:17 2010 +0000
+++ b/ChangeLog	Thu Jun 10 20:35:08 2010 +0000
@@ -7,6 +7,10 @@
 	Pidgin:
 	* Re-focus the input area after clicking the attention toolbar button.
 
+	Finch:
+	* Rebindable suggest-next-page and suggest-prev-page actions for
+	  textboxes (GntEntry) to scroll through list of suggestions.
+
 version 2.7.1 (05/29/2010):
 	General:
 	* Build fixes on OpenSolaris.  (Brian Lu)
--- a/doc/finch.1.in	Thu Jun 10 19:54:17 2010 +0000
+++ b/doc/finch.1.in	Thu Jun 10 20:35:08 2010 +0000
@@ -339,6 +339,10 @@
 .br
 up = suggest-prev
 .br
+page-down = suggest-next-page
+.br
+page-up = suggest-prev-page
+.br
 c-w = delete-prev-word
 .br
 a-b = cursor-prev-word
--- a/finch/libgnt/gntentry.c	Thu Jun 10 19:54:17 2010 +0000
+++ b/finch/libgnt/gntentry.c	Thu Jun 10 20:35:08 2010 +0000
@@ -579,6 +579,28 @@
 }
 
 static gboolean
+suggest_next_page(GntBindable *bind, GList *null)
+{
+	GntEntry *entry = GNT_ENTRY(bind);
+	if (entry->ddown) {
+		gnt_bindable_perform_action_named(GNT_BINDABLE(entry->ddown), "page-down", NULL);
+		return TRUE;
+	}
+	return FALSE;
+}
+
+static gboolean
+suggest_prev_page(GntBindable *bind, GList *null)
+{
+	GntEntry *entry = GNT_ENTRY(bind);
+	if (entry->ddown) {
+		gnt_bindable_perform_action_named(GNT_BINDABLE(entry->ddown), "page-up", NULL);
+		return TRUE;
+	}
+	return FALSE;
+}
+
+static gboolean
 del_to_home(GntBindable *bind, GList *null)
 {
 	GntEntry *entry = GNT_ENTRY(bind);
@@ -986,6 +1008,10 @@
 				GNT_KEY_DOWN, NULL);
 	gnt_bindable_class_register_action(bindable, "suggest-prev", suggest_prev,
 				GNT_KEY_UP, NULL);
+	gnt_bindable_class_register_action(bindable, "suggest-next-page", suggest_next_page,
+				GNT_KEY_PGDOWN, NULL);
+	gnt_bindable_class_register_action(bindable, "suggest-prev-page", suggest_prev_page,
+				GNT_KEY_PGUP, NULL);
 	gnt_bindable_class_register_action(bindable, "history-next", history_next,
 				GNT_KEY_CTRL_DOWN, NULL);
 	gnt_bindable_class_register_action(bindable, "history-prev", history_prev,
--- a/pidgin/gtkblist.c	Thu Jun 10 19:54:17 2010 +0000
+++ b/pidgin/gtkblist.c	Thu Jun 10 20:35:08 2010 +0000
@@ -4590,7 +4590,7 @@
 }
 
 static void
-plugin_changed_cb(PurplePlugin *p, gpointer *data)
+plugin_changed_cb(PurplePlugin *p, gpointer data)
 {
 	pidgin_blist_update_plugin_actions();
 }