Mercurial > pidgin

changeset 9301:3d5519a84d02

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 10105] Some stuff. Mostly from nosnilmot. Re-split the raise on events preference for IMs and chats. committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Thu, 17 Jun 2004 01:18:21 +0000
parents 98f01c233a40
children c45163af02fc
files plugins/ChangeLog.API src/about.c src/gtkconv.c src/gtkprefs.c src/prpl.h
diffstat 5 files changed, 29 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/plugins/ChangeLog.API	Thu Jun 17 00:26:57 2004 +0000
+++ b/plugins/ChangeLog.API	Thu Jun 17 01:18:21 2004 +0000
@@ -8,6 +8,11 @@
 	  GaimConvWindowUiOps.
 	* Added: gaim_conversation_has_focus() and gaim_conv_window_has_focus().
 
+	Plugin API: v5
+	* Changed: add_buddy, add_buddies, remove_buddy, remove_buddies,
+	  rename_group and remove_group to take GaimBuddy's and
+	  GaimGroup's consistently.
+
 version 0.78 (05/30/2004):
 	Plugin API: v4
 	* Added: actions - for plugins to add to the new Plugin Actions menu
--- a/src/about.c	Thu Jun 17 00:26:57 2004 +0000
+++ b/src/about.c	Thu Jun 17 01:18:21 2004 +0000
@@ -92,9 +92,10 @@
 	gaim_setup_imhtml(text);
 
 	gtk_imhtml_append_text(GTK_IMHTML(text),
-			  _("Gaim is a modular Instant Messaging client capable of "
-				  "using AIM, ICQ, Yahoo!, MSN, IRC, Jabber, Napster, "
-				  "Zephyr, and Gadu-Gadu all at once.  It is written using "
+			  _("Gaim is a modular messaging client capable of using "
+				  "AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, "
+				  "Novell GroupWise, Napster, Zephyr, and Gadu-Gadu "
+				  "all at once.  It is written using "
 				  "Gtk+ and is licensed under the GPL.<BR><BR>"), GTK_IMHTML_NO_SCROLL);
 
 	gtk_imhtml_append_text(GTK_IMHTML(text),
--- a/src/gtkconv.c	Thu Jun 17 00:26:57 2004 +0000
+++ b/src/gtkconv.c	Thu Jun 17 01:18:21 2004 +0000
@@ -4680,7 +4680,7 @@
 	g_object_get(G_OBJECT(gtkwin->window), "has-toplevel-focus", &has_focus, NULL);
 
 	if (!(flags & GAIM_MESSAGE_NO_LOG) &&
-		gaim_prefs_get_bool("/gaim/gtk/conversations/raise_on_events")) {
+		gaim_prefs_get_bool("/gaim/gtk/conversations/im/raise_on_events")) {
 
 		gaim_conv_window_raise(gaim_conversation_get_window(conv));
 	}
@@ -4745,7 +4745,7 @@
 	/* Raise the window, if specified in prefs. */
 	if (!(flags & GAIM_MESSAGE_NO_LOG) &&
 	    /* we may want to change this */
-		gaim_prefs_get_bool("/gaim/gtk/conversations/raise_on_events")) {
+		gaim_prefs_get_bool("/gaim/gtk/conversations/chat/raise_on_events")) {
 
 		gaim_conv_window_raise(gaim_conversation_get_window(conv));
 	}
@@ -4776,7 +4776,11 @@
 
 	win = gaim_conversation_get_window(conv);
 
-	if (!(flags & GAIM_MESSAGE_NO_LOG) && gaim_prefs_get_bool("/gaim/gtk/conversations/raise_on_events")) {
+	if (!(flags & GAIM_MESSAGE_NO_LOG) &&
+		((gaim_conversation_get_type(conv) == GAIM_CONV_CHAT &&
+		 gaim_prefs_get_bool("/gaim/gtk/conversations/chat/raise_on_events")) ||
+		(gaim_conversation_get_type(conv) == GAIM_CONV_IM &&
+		 gaim_prefs_get_bool("/gaim/gtk/conversations/im/raise_on_events")))) {
 		gaim_conv_window_show(win);
 	}
 
@@ -6029,7 +6033,8 @@
 	gaim_prefs_add_int("/gaim/gtk/conversations/tab_side", GTK_POS_TOP);
 	gaim_prefs_add_int("/gaim/gtk/conversations/button_type",
 					   GAIM_BUTTON_TEXT_IMAGE);
-	gaim_prefs_add_bool("/gaim/gtk/conversations/raise_on_events", FALSE);
+	gaim_prefs_add_bool("/gaim/gtk/conversations/im/raise_on_events", FALSE);
+	gaim_prefs_add_bool("/gaim/gtk/conversations/chat/raise_on_events", FALSE);
 
 
 	/* Conversations -> Chat */
--- a/src/gtkprefs.c	Thu Jun 17 00:26:57 2004 +0000
+++ b/src/gtkprefs.c	Thu Jun 17 01:18:21 2004 +0000
@@ -969,6 +969,9 @@
 	gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
 #endif /* PREFSLASH04 */
 
+	gaim_gtk_prefs_checkbox(_("Enable \"_slash\" commands"),
+			"/gaim/gtk/conversations/enable_commands", vbox);
+
 	gaim_gtk_prefs_checkbox(_("Show _formatting toolbar"),
 				  "/gaim/gtk/conversations/show_formatting_toolbar", vbox);
 	gaim_gtk_prefs_checkbox(_("Show _aliases in tabs/titles"),
@@ -977,12 +980,13 @@
 			"/gaim/gtk/conversations/im/show_buddy_icons", vbox);
 	gaim_gtk_prefs_checkbox(_("Enable buddy ic_on animation"),
 			"/gaim/gtk/conversations/im/animate_buddy_icons", vbox);
-	gaim_gtk_prefs_checkbox(_("_Raise window on events"),
-			"/gaim/gtk/conversations/raise_on_events", vbox);
 	gaim_gtk_prefs_checkbox(_("_Notify buddies that you are typing to them"),
 			"/core/conversations/im/send_typing", vbox);
-	gaim_gtk_prefs_checkbox(_("Enable \"_slash\" commands"),
-			"/gaim/gtk/conversations/enable_commands", vbox);
+	gaim_gtk_prefs_checkbox(_("_Raise IM window on events"),
+			"/gaim/gtk/conversations/im/raise_on_events", vbox);
+
+	gaim_gtk_prefs_checkbox(_("_Raise chat window on events"),
+			"/gaim/gtk/conversations/chat/raise_on_events", vbox);
 	gaim_gtk_prefs_checkbox(_("Use _multi-colored screen names in chats"),
 			"/gaim/gtk/conversations/chat/color_nicks", vbox);
 
@@ -2725,8 +2729,6 @@
 
 	gaim_prefs_rename("/gaim/gtk/conversations/im/button_type",
 			"/gaim/gtk/conversations/button_type");
-	gaim_prefs_rename("/gaim/gtk/conversations/im/raise_on_events",
-			"/gaim/gtk/conversations/raise_on_events");
 
 	/* Remove some no-longer-used prefs */
 	gaim_prefs_remove("/gaim/gtk/blist/show_group_count");
@@ -2746,4 +2748,5 @@
 	gaim_prefs_remove("/gaim/gtk/conversations/use_custom_bgcolor");
 	gaim_prefs_remove("/gaim/gtk/conversations/use_custom_fgcolor");
 	gaim_prefs_remove("/gaim/gtk/conversations/use_custom_size");
+	gaim_prefs_remove("/gaim/gtk/conversations/im/hide_on_send");
 }
--- a/src/prpl.h	Thu Jun 17 00:26:57 2004 +0000
+++ b/src/prpl.h	Thu Jun 17 01:18:21 2004 +0000
@@ -306,8 +306,8 @@
 
 /* It's not like we're going to run out of integers for this version
    number, but we only want to really change it once per release. */
-/* GAIM_PRPL_API_VERSION last changed for version: 0.78 */
-#define GAIM_PRPL_API_VERSION 4
+/* GAIM_PRPL_API_VERSION last changed for version: 0.79 */
+#define GAIM_PRPL_API_VERSION 5
 
 #ifdef __cplusplus
 extern "C" {