Mercurial > pidgin

changeset 10129:7d2d9db2aa85

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 11191] Another one bites the dust. committer: Tailor Script <tailor@pidgin.im>
author Sean Egan <seanegan@gmail.com>
date Thu, 21 Oct 2004 18:42:29 +0000
parents 0f78e7e45afd
children 096197a628bf
files ChangeLog src/gtkblist.c src/gtkprefs.c
diffstat 3 files changed, 4 insertions(+), 124 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Oct 21 12:48:41 2004 +0000
+++ b/ChangeLog	Thu Oct 21 18:42:29 2004 +0000
@@ -10,6 +10,9 @@
 	* Screenname colors in chats now come from GNOME color palette
 	* Yahoo! has the following new "/" commands:  /join, /buzz
 
+	Bug fixes:
+	* People using input methods can now use Enter again.
+
 	Preference changes:
 	* Removed keyboard shortcut preferences for ctrl-b/i/u and made sure they
 	  won't interfere with bindings set by the GTK theme.
@@ -19,6 +22,7 @@
 	* Removed "Show multi-colored screennames in chats," defaulted to "Yes."
 	  Made screenname colors automatically adjust themselves to compensate for
 	  background color.
+	* Removed "Raise Buddy List Window on Events" defaulted to "No"
 
 version 1.0.2 (10/19/2004):
 	Bug Fixes:
--- a/src/gtkblist.c	Thu Oct 21 12:48:41 2004 +0000
+++ b/src/gtkblist.c	Thu Oct 21 18:42:29 2004 +0000
@@ -3021,22 +3021,6 @@
 	gaim_gtk_blist_update_plugin_actions();
 }
 
-
-/* this is called on all sorts of signals, and we have no reason to pass
- * it anything, so it remains without arguments. If you need anything
- * more specific, do as below, and create another callback that calls
- * this */
-static void
-raise_on_events_cb()
-{
-	if(gtkblist && gtkblist->window &&
-			gaim_prefs_get_bool("/gaim/gtk/blist/raise_on_events")) {
-		gtk_widget_show(gtkblist->window);
-		gtk_window_deiconify(GTK_WINDOW(gtkblist->window));
-		gdk_window_raise(gtkblist->window->window);
-	}
-}
-
 /**********************************************************************************
  * Public API Functions                                                           *
  **********************************************************************************/
@@ -3047,12 +3031,6 @@
 
 	gtkblist = g_new0(GaimGtkBuddyList, 1);
 	blist->ui_data = gtkblist;
-
-	/* All of these signal handlers are for the "Raise on Events" option */
-	gaim_signal_connect(gaim_blist_get_handle(), "buddy-signed-on",
-			gtkblist, GAIM_CALLBACK(raise_on_events_cb), NULL);
-	gaim_signal_connect(gaim_blist_get_handle(), "buddy-signed-off",
-			gtkblist, GAIM_CALLBACK(raise_on_events_cb), NULL);
 }
 
 static void gaim_gtk_blist_new_node(GaimBlistNode *node)
@@ -4541,7 +4519,6 @@
 	/* Initialize prefs */
 	gaim_prefs_add_none("/gaim/gtk/blist");
 	gaim_prefs_add_bool("/gaim/gtk/blist/auto_expand_contacts", 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_idle_time", TRUE);
--- a/src/gtkprefs.c	Thu Oct 21 12:48:41 2004 +0000
+++ b/src/gtkprefs.c	Thu Oct 21 18:42:29 2004 +0000
@@ -906,10 +906,6 @@
 
 	g_list_free(l);
 
-	vbox = gaim_gtk_make_frame (ret, _("Buddy List Window"));
-	gaim_gtk_prefs_checkbox(_("_Raise window on events"),
-			"/gaim/gtk/blist/raise_on_events", vbox);
-
 	vbox = gaim_gtk_make_frame (ret, _("Buddy Display"));
 	gaim_gtk_prefs_checkbox(_("Show buddy _icons"),
 			"/gaim/gtk/blist/show_buddy_icons", vbox);
@@ -2267,102 +2263,6 @@
 */
 }
 
-GtkWidget *away_message_page() {
-	GtkWidget *ret;
-	GtkWidget *hbox;
-	GtkWidget *button;
-	GtkWidget *sw;
-	GtkWidget *event_view;
-	GtkCellRenderer *rend;
-	GtkTreeViewColumn *col;
-	GtkTreeSelection *sel;
-/* XXX CORE/UI
-	GtkTreeIter iter;
-	GSList *awy = away_messages;
-	struct away_message *a;
-*/
-	GtkSizeGroup *sg;
-
-	ret = gtk_vbox_new(FALSE, 18);
-	gtk_container_set_border_width (GTK_CONTAINER (ret), 12);
-
-	sg = gtk_size_group_new(GTK_SIZE_GROUP_BOTH);
-
-	sw = gtk_scrolled_window_new(NULL,NULL);
-	gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw), GTK_SHADOW_IN);
-	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw), GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
-	gtk_box_pack_start(GTK_BOX(ret), sw, TRUE, TRUE, 0);
-
-	prefs_away_store = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_POINTER);
-/* XXX CORE/UI
-	while (awy) {
-		a = (struct away_message *)awy->data;
-		gtk_list_store_append (prefs_away_store, &iter);
-		gtk_list_store_set(prefs_away_store, &iter,
-				   0, a->name,
-				   1, a, -1);
-		awy = awy->next;
-	}
-*/
-	event_view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(prefs_away_store));
-
-	rend = gtk_cell_renderer_text_new();
-	col = gtk_tree_view_column_new_with_attributes ("NULL",
-							rend,
-							"text", 0,
-							NULL);
-	gtk_tree_view_append_column (GTK_TREE_VIEW(event_view), col);
-	gtk_tree_view_set_headers_visible (GTK_TREE_VIEW(event_view), FALSE);
-	gtk_widget_show(event_view);
-	gtk_container_add(GTK_CONTAINER(sw), event_view);
-
-	sw = gtk_scrolled_window_new(NULL, NULL);
-	gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw), GTK_SHADOW_IN);
-	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw),
-				       GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
-	gtk_box_pack_start(GTK_BOX(ret), sw, TRUE, TRUE, 0);
-
-	away_text = gtk_imhtml_new(NULL, NULL);
-	gtk_container_add(GTK_CONTAINER(sw), away_text);
-
-	gaim_setup_imhtml(away_text);
-	sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (event_view));
-	g_signal_connect(G_OBJECT(sel), "changed",
-					 G_CALLBACK(away_message_sel_cb), NULL);
-	g_signal_connect(G_OBJECT(event_view), "button-press-event",
-					 G_CALLBACK(away_message_click_cb), NULL);
-	hbox = gtk_hbox_new(TRUE, 5);
-	gtk_box_pack_start(GTK_BOX(ret), hbox, FALSE, FALSE, 0);
-	button = gtk_button_new_from_stock (GTK_STOCK_ADD);
-	gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
-	gtk_size_group_add_widget(sg, button);
-
-/* XXX CORE/UI
-	g_signal_connect(G_OBJECT(button), "clicked",
-					 G_CALLBACK(create_away_mess), NULL);
-*/
-
-	button = gtk_button_new_from_stock (GTK_STOCK_REMOVE);
-	gtk_size_group_add_widget(sg, button);
-
-/* XXX CORE/UI
-	g_signal_connect(G_OBJECT(button), "clicked",
-					 G_CALLBACK(remove_away_message), event_view);
-*/
-
-	gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
-
-	button = gaim_pixbuf_button_from_stock(_("_Edit"), GAIM_STOCK_EDIT,
-			GAIM_BUTTON_HORIZONTAL);
-	gtk_size_group_add_widget(sg, button);
-	g_signal_connect(G_OBJECT(button), "clicked",
-					 G_CALLBACK(away_edit_sel), event_view);
-	gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
-
-	gtk_widget_show_all(ret);
-	return ret;
-}
-
 GtkTreeIter *prefs_notebook_add_page(const char *text,
 				     GdkPixbuf *pixbuf,
 				     GtkWidget *page,
@@ -2403,7 +2303,6 @@
 #endif
 	prefs_notebook_add_page(_("Logging"), NULL, logging_page(), &p, NULL, notebook_page++);
 	prefs_notebook_add_page(_("Away / Idle"), NULL, away_page(), &p, NULL, notebook_page++);
-	prefs_notebook_add_page(_("Away Messages"), NULL, away_message_page(), &c, &p, notebook_page++);
 
 	if (gaim_plugins_enabled()) {
 		prefs_notebook_add_page(_("Plugins"), NULL, plugin_page(), &plugin_iter, NULL, notebook_page++);