# HG changeset patch
# User Sean Egan <seanegan@gmail.com>
# Date 1105229614 0
# Node ID 45ad1d15fab311f5edb89a70f03f6c66c1013c55
# Parent  9655389f4b8117bc38c98cbd27953cc1bb51c1dd
[gaim-migrate @ 11782]
ChangeLogged slashed prefs.  gaim_pref_removed slashed prefs.  Added Raise
to notify.c.

I gaim_pref_renamed raise IM window on events to notify's pref.  It's a hack
but I'm wondering if anyone has any serious problem with that.

committer: Tailor Script <tailor@pidgin.im>

diff -r 9655389f4b81 -r 45ad1d15fab3 ChangeLog
--- a/ChangeLog	Sat Jan 08 23:40:24 2005 +0000
+++ b/ChangeLog	Sun Jan 09 00:13:34 2005 +0000
@@ -46,12 +46,16 @@
 	  defaulted to "Yes".
 	* Removed "Auto-expand contacts" default to "No"
 	* Removed conversation buttons
-	* Removed "Raise conversation window" preferences, default to "no"
+	* Removed "Raise conversation window" preferences, moved feature to notify
+	  plugin
 	* Removed "Show alias in tabs/titles," default to "Yes".
 	* Removed "Show formatting toolbars," made the option in the
 	  conversation menu affect the global preference.
 	* Removed "Show timestamps," defaulted to yes but made timestamp plugin
 	  override this.
+	* Removed protocol options.
+	* Consolidated three ignore formatting options into a single one.
+	* Removed "Escape closes windows," defaulted to Ctrl-W.
 
 version 1.0.2 (10/19/2004):
 	Bug Fixes:
diff -r 9655389f4b81 -r 45ad1d15fab3 plugins/notify.c
--- a/plugins/notify.c	Sat Jan 08 23:40:24 2005 +0000
+++ b/plugins/notify.c	Sun Jan 09 00:13:34 2005 +0000
@@ -64,10 +64,14 @@
  *  -Re-added Urgent option
  *  -Re-added unnotify on focus option (still needs work, as it will only
  *  react to focus-in events when the entry or history widgets are focused)
+ *
+ * Sean, 08 January, 2005:
+ *  -Added Raise option, formally in Gaim proper
  */
 
 #include "internal.h"
 #include "gtkgaim.h"
+#include "gtkprefs.h"
 
 #include "debug.h"
 #include "prefs.h"
@@ -99,6 +103,9 @@
 static void apply_method();
 static void apply_notify();
 
+/* raise function */
+static void handle_raise(GaimConvWindow *window);
+
 /* string function */
 static void handle_string(GaimConvWindow *window);
 
@@ -175,6 +182,8 @@
 		handle_string(gaimwin);
 	if (gaim_prefs_get_bool("/plugins/gtk/X11/notify/method_urgent"))
 		handle_urgent(gaimwin, TRUE);
+	if (gaim_prefs_get_bool("/plugins/gtk/X11/notify/method_raise"))
+		handle_raise(gaimwin);
 }
 
 static void
@@ -459,6 +468,13 @@
 }
 
 static void
+handle_raise(GaimConvWindow *gaimwin)
+{
+	GtkWindow *window = GTK_WINDOW(GAIM_GTK_WINDOW(gaimwin)->window);
+	gtk_window_present(window);
+}
+
+static void
 handle_count(GaimConvWindow *gaimwin)
 {
 	GtkWindow *window;
@@ -628,6 +644,9 @@
 	frame = gaim_gtk_make_frame(ret, _("Notification Methods"));
 	vbox = gtk_vbox_new(FALSE, 5);
 	gtk_container_add(GTK_CONTAINER(frame), vbox);
+	
+	/* Raise method button */
+	gaim_gtk_prefs_checkbox("R_aise window", "/plugins/gtk/X11/notify/method_raise", vbox);
 
 	/* String method button */
 	hbox = gtk_hbox_new(FALSE, 18);
@@ -828,6 +847,7 @@
 	gaim_prefs_add_string("/plugins/gtk/X11/notify/title_string", "(*)");
 	gaim_prefs_add_bool("/plugins/gtk/X11/notify/method_urgent", FALSE);
 	gaim_prefs_add_bool("/plugins/gtk/X11/notify/method_count", FALSE);
+	gaim_prefs_add_bool("/plugins/gtk/X11/notify/method_raise", FALSE);
 	gaim_prefs_add_bool("/plugins/gtk/X11/notify/notify_focus", FALSE);
 	gaim_prefs_add_bool("/plugins/gtk/X11/notify/notify_click", FALSE);
 	gaim_prefs_add_bool("/plugins/gtk/X11/notify/notify_type", TRUE);
diff -r 9655389f4b81 -r 45ad1d15fab3 src/gtkprefs.c
--- a/src/gtkprefs.c	Sat Jan 08 23:40:24 2005 +0000
+++ b/src/gtkprefs.c	Sun Jan 09 00:13:34 2005 +0000
@@ -2204,7 +2204,6 @@
 
 	/* The notebook */
 	prefsnotebook = notebook = gtk_notebook_new ();
-	gtk_notebook_set_tab_pos(GTK_NOTEBOOK(notebook), GTK_POS_LEFT);
 	gtk_notebook_set_show_tabs (GTK_NOTEBOOK (notebook), TRUE);
 	gtk_notebook_set_show_border (GTK_NOTEBOOK (notebook), FALSE);
 	gtk_box_pack_start (GTK_BOX (vbox), notebook, FALSE, FALSE, 0);
@@ -2315,6 +2314,7 @@
 
 	gaim_prefs_rename("/gaim/gtk/debug/timestamps", "/core/debug/timestamps");
 	gaim_prefs_rename("/gaim/gtk/conversations/ignore_colors", "/gaim/gtk/conversations/ignore_formatting");
+	gaim_prefs_rename("/gaim/gtk/conversations/im/raise_on_events", "/plugins/gtk/x11/notify/method/raise");
 
 	/* Remove some no-longer-used prefs */
 	gaim_prefs_remove("/gaim/gtk/blist/auto_expand_contacts");
@@ -2339,9 +2339,10 @@
 	gaim_prefs_remove("/gaim/gtk/conversations/chat/old_tab_complete");
 	gaim_prefs_remove("/gaim/gtk/conversations/chat/tab_completion");
 	gaim_prefs_remove("/gaim/gtk/conversations/im/hide_on_send");
-	gaim_prefs_remove("/gaim/gtk/conversations/im/raise_on_events");
 	gaim_prefs_remove("/gaim/gtk/conversations/chat/color_nicks");
 	gaim_prefs_remove("/gaim/gtk/conversations/chat/raise_on_events");
+	gaim_prefs_remove("/gaim/gtk/conversations/ignore_fonts");
+	gaim_prefs_remove("/gaim/gtk/conversations/ignore_font_sizes");
 	gaim_prefs_remove("/gaim/gtk/logging/individual_logs");
 	gaim_prefs_remove("/gaim/gtk/sound/signon");
 	gaim_prefs_remove("/gaim/gtk/sound/silent_signon");