/pidgin/main: 39c2c22bc99f: Arhg... merge

[Tomasz Wasilczyk]

Changeset: 39c2c22bc99ff30b10cc390c9e2410e2c1215409
Author:	 Tomasz Wasilczyk <tomkiewicz at cpw.pidgin.im>
Date:	 2012-11-19 15:53 +0100
Branch:	 default
URL: http://hg.pidgin.im/pidgin/main/rev/39c2c22bc99f

Description:

Arhg... merge

diffstat:

 COPYRIGHT           |  1 +
 ChangeLog           |  2 ++
 pidgin/gtkdocklet.c |  3 ++-
 pidgin/gtkprefs.c   |  7 +++++++
 4 files changed, 12 insertions(+), 1 deletions(-)

diffs (60 lines):

diff --git a/COPYRIGHT b/COPYRIGHT
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -255,6 +255,7 @@ Instant Messaging Freedom, Inc.
 Vitaliy Ischenko
 Intel Corporation
 Andrew Ivanov
+Momchil Ivanov
 Scott Jackson
 Hans Petter Jansson
 David Jedelsky
diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,8 @@ version 3.0.0 (??/??/????):
 	  support.  The default is 'auto', which will first look for 3.x
 	  development headers and then 2.x development headers.
 	* Add email notification in the docklet area. (Alexei) (#3571)
+	* Add a pref to select the type messages in conversation that triggers 
+	  the docklet notification. (Momchil) (#12598)
 
 	Finch:
 	* Support the conversation-extended signal for extending the
diff --git a/pidgin/gtkdocklet.c b/pidgin/gtkdocklet.c
--- a/pidgin/gtkdocklet.c
+++ b/pidgin/gtkdocklet.c
@@ -141,7 +141,7 @@ get_pending_list(guint max)
 		return l_im;
 
 	l_chat = pidgin_conversations_find_unseen_list(PURPLE_CONV_TYPE_CHAT,
-		 					 PIDGIN_UNSEEN_NICK,
+	    purple_prefs_get_int(PIDGIN_PREFS_ROOT "/conversations/notification_chat"),
 							 FALSE, max);
 
 	if (l_im != NULL && l_chat != NULL)
@@ -1026,6 +1026,7 @@ pidgin_docklet_init()
 	purple_prefs_add_string(PIDGIN_PREFS_ROOT "/docklet/show", "always");
 	purple_prefs_connect_callback(docklet_handle, PIDGIN_PREFS_ROOT "/docklet/show",
 				    docklet_show_pref_changed_cb, NULL);
+	purple_prefs_add_int(PIDGIN_PREFS_ROOT "/conversations/notification_chat", PIDGIN_UNSEEN_TEXT);
 
 	purple_prefs_add_none(PIDGIN_PREFS_ROOT "/docklet/gtk");
 	if (purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/docklet/x11/embedded")) {
diff --git a/pidgin/gtkprefs.c b/pidgin/gtkprefs.c
--- a/pidgin/gtkprefs.c
+++ b/pidgin/gtkprefs.c
@@ -1720,6 +1720,13 @@ conv_page(void)
 
 	vbox = pidgin_make_frame(ret, _("Conversations"));
 
+	pidgin_prefs_dropdown(vbox, _("Chat notification:"),
+		PURPLE_PREF_INT, PIDGIN_PREFS_ROOT "/conversations/notification_chat",
+		_("On unseen events"), PIDGIN_UNSEEN_EVENT,
+		_("On unseen text"), PIDGIN_UNSEEN_TEXT,
+		_("On unseen text and the nick was said"), PIDGIN_UNSEEN_NICK,
+		NULL);
+
 	pidgin_prefs_checkbox(_("Show _formatting on incoming messages"),
 				PIDGIN_PREFS_ROOT "/conversations/show_incoming_formatting", vbox);
 	pidgin_prefs_checkbox(_("Close IMs immediately when the tab is closed"),