[Gaim-commits] SF.net SVN: gaim: [17687] trunk

[<tal...@us...>]

Revision: 17687
          http://svn.sourceforge.net/gaim/?rev=17687&view=rev
Author:   taliesein
Date:     2006-11-06 15:01:44 -0800 (Mon, 06 Nov 2006)

Log Message:
-----------
closing feature request 1487779, bug 1465187, with patch 1540877. This is all related to the psychic plugin, so ignore as befitting.

Modified Paths:
--------------
    trunk/COPYRIGHT
    trunk/libgaim/plugins/psychic.c

Modified: trunk/COPYRIGHT
===================================================================
--- trunk/COPYRIGHT	2006-11-06 22:32:49 UTC (rev 17686)
+++ trunk/COPYRIGHT	2006-11-06 23:01:44 UTC (rev 17687)
@@ -149,6 +149,7 @@
 Kevin Hunter
 Rian Hunter
 Thomas Huriaux
+Scott Jackson
 Hans Petter Jansson
 Henry Jen
 Benjamin Kahn

Modified: trunk/libgaim/plugins/psychic.c
===================================================================
--- trunk/libgaim/plugins/psychic.c	2006-11-06 22:32:49 UTC (rev 17686)
+++ trunk/libgaim/plugins/psychic.c	2006-11-06 23:01:44 UTC (rev 17687)
@@ -28,6 +28,7 @@
 #define PREF_BUDDIES  PREFS_BASE "/buddies_only"
 #define PREF_NOTICE   PREFS_BASE "/show_notice"
 #define PREF_STATUS   PREFS_BASE "/activate_online"
+#define PREF_RAISE    PREFS_BASE "/raise_conv"
 
 
 static void
@@ -50,16 +51,18 @@
   if(! gconv) {
     gaim_debug_info("psychic", "no previous conversation exists\n");
     gconv = gaim_conversation_new(GAIM_CONV_TYPE_IM, acct, name);
-    gaim_conversation_present(gconv);
 
+    if(gaim_prefs_get_bool(PREF_RAISE)) {
+      gaim_conversation_present(gconv);
+    }
+
     if(gaim_prefs_get_bool(PREF_NOTICE)) {
+
+      /* This is a quote from Star Wars.  You should probably not
+	 translate it literally.  If you can't find a fitting cultural
+	 reference in your language, consider translating something
+	 like this instead: "You feel a new message coming." */
       gaim_conversation_write(gconv, NULL,
-			      /* This is a quote from Star Wars.  You should
-			         probably not translate it literally.  If
-				 you can't find a fitting cultural reference
-				 in your language, consider translating
-				 something like this instead:
-				 "You feel a new message coming." */
 			      _("You feel a disturbance in the force..."),
 			      GAIM_MESSAGE_SYSTEM | GAIM_MESSAGE_NO_LOG | GAIM_MESSAGE_ACTIVE_ONLY,
 			      time(NULL));
@@ -92,6 +95,10 @@
 				     " conversations"));
   gaim_plugin_pref_frame_add(frame, pref);
 
+  pref = gaim_plugin_pref_new_with_name(PREF_RAISE);
+  gaim_plugin_pref_set_label(pref, _("Raise psychic conversations"));
+  gaim_plugin_pref_frame_add(frame, pref);
+
   return frame;
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.