changeset 7731:36727d6e1d5a

[gaim-migrate @ 8376] here's an option to become un-cool. committer: Tailor Script <tailor@pidgin.im>
author Nathan Walp <nwalp@pidgin.im>
date Thu, 04 Dec 2003 03:20:39 +0000
parents 01eb54bb41dc
children 31fd796d3909
files src/gtkblist.c src/gtkprefs.c
diffstat 2 files changed, 24 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/src/gtkblist.c	Thu Dec 04 03:19:59 2003 +0000
+++ b/src/gtkblist.c	Thu Dec 04 03:20:39 2003 +0000
@@ -1478,7 +1478,9 @@
 
 	gtknode = node->ui_data;
 
-	if (node->child && GAIM_BLIST_NODE_IS_CONTACT(node) && ((GaimContact*)node)->online > 1 && !gtknode->contact_expanded) {
+	if (node->child && GAIM_BLIST_NODE_IS_CONTACT(node) &&
+			((GaimContact*)node)->online > 1 && !gtknode->contact_expanded &&
+			gaim_prefs_get_bool("/gaim/gtk/blist/auto_expand_contacts")) {
 		GtkTreeIter i;
 		gaim_gtk_blist_expand_contact_cb(NULL, node);
 		tooltip_top = TRUE; /* When the person expands, the new screennames will be below.  We'll draw the tip above
@@ -3779,6 +3781,25 @@
 	gaim_signal_connect(gaim_connections_get_handle(), "signed-on",
 						&gtk_blist_handle, GAIM_CALLBACK(account_signon_cb),
 						NULL);
+
+	/* Initialize prefs */
+    gaim_prefs_add_none("/gaim/gtk/blist");
+	gaim_prefs_add_bool("/gaim/gtk/blist/auto_expand_contacts", TRUE);
+    gaim_prefs_add_int("/gaim/gtk/blist/button_style", GAIM_BUTTON_TEXT_IMAGE);
+    gaim_prefs_add_bool("/gaim/gtk/blist/grey_idle_buddies", TRUE);
+    gaim_prefs_add_bool("/gaim/gtk/blist/raise_on_events", FALSE);
+    gaim_prefs_add_bool("/gaim/gtk/blist/show_buddy_icons", TRUE);
+    gaim_prefs_add_bool("/gaim/gtk/blist/show_empty_groups", FALSE);
+    gaim_prefs_add_bool("/gaim/gtk/blist/show_group_count", TRUE);
+    gaim_prefs_add_bool("/gaim/gtk/blist/show_idle_time", TRUE);
+    gaim_prefs_add_bool("/gaim/gtk/blist/show_offline_buddies", FALSE);
+    gaim_prefs_add_bool("/gaim/gtk/blist/show_warning_level", TRUE);
+    gaim_prefs_add_string("/gaim/gtk/blist/sort_type", "");
+    gaim_prefs_add_int("/gaim/gtk/blist/x", 0);
+    gaim_prefs_add_int("/gaim/gtk/blist/y", 0);
+    gaim_prefs_add_int("/gaim/gtk/blist/width", 0);
+    gaim_prefs_add_int("/gaim/gtk/blist/height", 0);
+
 }
 
 
--- a/src/gtkprefs.c	Thu Dec 04 03:19:59 2003 +0000
+++ b/src/gtkprefs.c	Thu Dec 04 03:20:39 2003 +0000
@@ -858,6 +858,8 @@
 			"/gaim/gtk/blist/show_idle_time", vbox);
 	prefs_checkbox(_("Dim i_dle buddies"),
 			"/gaim/gtk/blist/grey_idle_buddies", vbox);
+	prefs_checkbox(_("_Automatically expand contacts"),
+			"/gaim/gtk/blist/auto_expand_contacts", vbox);
 
 	gtk_widget_show_all(ret);
 
@@ -2711,23 +2713,6 @@
 	gaim_prefs_add_string("/gaim/gtk/browsers/command", "");
 	gaim_prefs_add_string("/gaim/gtk/browsers/browser", "mozilla");
 
-	/* Buddy List */
-	gaim_prefs_add_none("/gaim/gtk/blist");
-	gaim_prefs_add_int("/gaim/gtk/blist/button_style", GAIM_BUTTON_TEXT_IMAGE);
-	gaim_prefs_add_bool("/gaim/gtk/blist/grey_idle_buddies", TRUE);
-	gaim_prefs_add_bool("/gaim/gtk/blist/raise_on_events", FALSE);
-	gaim_prefs_add_bool("/gaim/gtk/blist/show_buddy_icons", TRUE);
-	gaim_prefs_add_bool("/gaim/gtk/blist/show_empty_groups", FALSE);
-	gaim_prefs_add_bool("/gaim/gtk/blist/show_group_count", TRUE);
-	gaim_prefs_add_bool("/gaim/gtk/blist/show_idle_time", TRUE);
-	gaim_prefs_add_bool("/gaim/gtk/blist/show_offline_buddies", FALSE);
-	gaim_prefs_add_bool("/gaim/gtk/blist/show_warning_level", TRUE);
-	gaim_prefs_add_string("/gaim/gtk/blist/sort_type", "");
-	gaim_prefs_add_int("/gaim/gtk/blist/x", 0);
-	gaim_prefs_add_int("/gaim/gtk/blist/y", 0);
-	gaim_prefs_add_int("/gaim/gtk/blist/width", 0);
-	gaim_prefs_add_int("/gaim/gtk/blist/height", 0);
-
 	/* Idle */
 	gaim_prefs_add_none("/gaim/gtk/idle");
 	gaim_prefs_add_string("/gaim/gtk/idle/reporting_method", "system");