Mercurial > pidgin

changeset 10164:3f71f7282dbf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 11250] Remove some code left over from the HTML shortcut pref and the smiley shortcut pref for gtkimhtml windows. committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Tue, 09 Nov 2004 05:36:06 +0000
parents 34a8bbf5b1b9
children 5c3b27763126
files ChangeLog src/gtkconv.c src/gtkprefs.c src/gtkrequest.c
diffstat 4 files changed, 5 insertions(+), 62 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Tue Nov 09 05:24:04 2004 +0000
+++ b/ChangeLog	Tue Nov 09 05:36:06 2004 +0000
@@ -20,6 +20,8 @@
 	* Removed "Dim idle buddies" buddy list preference, default to "Yes."
 	* Removed keyboard shortcut preferences for ctrl-b/i/u and made sure they
 	  won't interfere with bindings set by the GTK theme.
+	* Removed keyboard shortcuts preferences for ctrl-# to insert a smiley,
+	  default to "No"
 	* Removed preference for buddy list button type, defaulted to "None"
 	* Removed "Enter" vs. "Ctrl-Enter" to send, defaulted to "Enter" to send,
 	  made it possible to change this binding in your GTK theme.
--- a/src/gtkconv.c	Tue Nov 09 05:24:04 2004 +0000
+++ b/src/gtkconv.c	Tue Nov 09 05:36:06 2004 +0000
@@ -4204,10 +4204,6 @@
 
 	gtkconv->entry = gtk_imhtml_new(NULL, NULL);
 	gtk_widget_set_name(gtkconv->entry, "gaim_gtkconv_entry");
-	gtk_imhtml_smiley_shortcuts(GTK_IMHTML(gtkconv->entry),
-			gaim_prefs_get_bool("/gaim/gtk/conversations/smiley_shortcuts"));
-	gtk_imhtml_html_shortcuts(GTK_IMHTML(gtkconv->entry),
-			gaim_prefs_get_bool("/gaim/gtk/conversations/html_shortcuts"));
 
 	gtk_imhtml_set_protocol_name(GTK_IMHTML(gtkconv->entry),
 								 gaim_account_get_protocol_name(conv->account));
@@ -4336,7 +4332,7 @@
 	/* Build the toolbar. */
 	gtkconv->toolbar = gtk_imhtmltoolbar_new();
 	gtk_box_pack_start(GTK_BOX(vbox3), gtkconv->toolbar, FALSE, FALSE, 0);
-	
+
 	sep = gtk_hseparator_new();
 	gtk_box_pack_start(GTK_BOX(vbox3), sep, FALSE, FALSE, 0);
 	gtk_widget_show(sep);
@@ -4352,11 +4348,6 @@
 	gtkconv->entry = gtk_imhtml_new(NULL, NULL);
 	gtk_widget_set_name(gtkconv->entry, "gaim_gtkconv_entry");
 
-	gtk_imhtml_smiley_shortcuts(GTK_IMHTML(gtkconv->entry),
-			gaim_prefs_get_bool("/gaim/gtk/conversations/smiley_shortcuts"));
-	gtk_imhtml_html_shortcuts(GTK_IMHTML(gtkconv->entry),
-			gaim_prefs_get_bool("/gaim/gtk/conversations/html_shortcuts"));
-
 	gtk_imhtml_set_protocol_name(GTK_IMHTML(gtkconv->entry),
 								 gaim_account_get_protocol_name(conv->account));
 	gtkconv->entry_buffer =
@@ -6157,48 +6148,6 @@
 }
 
 static void
-html_shortcuts_pref_cb(const char *name, GaimPrefType type,
-					   gpointer value, gpointer data)
-{
-	GList *l;
-	GaimConversation *conv;
-	GaimGtkConversation *gtkconv;
-
-	for(l = gaim_get_conversations(); l != NULL; l = l->next) {
-		conv = (GaimConversation *)l->data;
-
-		if(!GAIM_IS_GTK_CONVERSATION(conv))
-			continue;
-
-		gtkconv = GAIM_GTK_CONVERSATION(conv);
-
-		gtk_imhtml_html_shortcuts(GTK_IMHTML(gtkconv->entry),
-								  (gboolean)GPOINTER_TO_INT(value));
-	}
-}
-
-static void
-smiley_shortcuts_pref_cb(const char *name, GaimPrefType type,
-						 gpointer value, gpointer data)
-{
-	GList *l;
-	GaimConversation *conv;
-	GaimGtkConversation *gtkconv;
-
-	for(l = gaim_get_conversations(); l != NULL; l = l->next) {
-		conv = (GaimConversation *)l->data;
-
-		if(!GAIM_IS_GTK_CONVERSATION(conv))
-			continue;
-
-		gtkconv = GAIM_GTK_CONVERSATION(conv);
-
-		gtk_imhtml_smiley_shortcuts(GTK_IMHTML(gtkconv->entry),
-									(gboolean)GPOINTER_TO_INT(value));
-	}
-}
-
-static void
 show_formatting_toolbar_pref_cb(const char *name, GaimPrefType type,
 								gpointer value, gpointer data)
 {
@@ -6384,10 +6333,6 @@
 								close_on_tabs_pref_cb, NULL);
 	gaim_prefs_connect_callback(handle, "/gaim/gtk/conversations/show_timestamps",
 								show_timestamps_pref_cb, NULL);
-	gaim_prefs_connect_callback(handle, "/gaim/gtk/conversations/html_shortcuts",
-								html_shortcuts_pref_cb, NULL);
-	gaim_prefs_connect_callback(handle, "/gaim/gtk/conversations/smiley_shortcuts",
-								smiley_shortcuts_pref_cb, NULL);
 	gaim_prefs_connect_callback(handle, "/gaim/gtk/conversations/show_formatting_toolbar",
 								show_formatting_toolbar_pref_cb, NULL);
 	gaim_prefs_connect_callback(handle, "/gaim/gtk/conversations/spellcheck",
--- a/src/gtkprefs.c	Tue Nov 09 05:24:04 2004 +0000
+++ b/src/gtkprefs.c	Tue Nov 09 05:36:06 2004 +0000
@@ -823,10 +823,6 @@
 	gtk_imhtml_set_format_functions(GTK_IMHTML(imhtml), GTK_IMHTML_ALL ^ GTK_IMHTML_IMAGE);
 	gtk_imhtml_set_whole_buffer_formatting_only(GTK_IMHTML(imhtml), TRUE);
 
-	gtk_imhtml_smiley_shortcuts(GTK_IMHTML(imhtml),
-			gaim_prefs_get_bool("/gaim/gtk/conversations/smiley_shortcuts"));
-	gtk_imhtml_html_shortcuts(GTK_IMHTML(imhtml),
-			gaim_prefs_get_bool("/gaim/gtk/conversations/html_shortcuts"));
 	gtk_imhtmltoolbar_attach(GTK_IMHTMLTOOLBAR(toolbar), imhtml);
 	gtk_imhtmltoolbar_associate_smileys(GTK_IMHTMLTOOLBAR(toolbar), "default");
 	gaim_setup_imhtml(imhtml);
@@ -2470,9 +2466,11 @@
 	gaim_prefs_remove("/gaim/gtk/blist/button_style");
 	gaim_prefs_remove("/gaim/gtk/blist/raise_on_events");
 	gaim_prefs_remove("/gaim/gtk/blist/show_group_count");
+	gaim_prefs_remove("/gaim/gtk/conversations/html_shortcuts");
 	gaim_prefs_remove("/gaim/gtk/conversations/icons_on_tabs");
 	gaim_prefs_remove("/gaim/gtk/conversations/show_urls_as_links");
 	gaim_prefs_remove("/gaim/gtk/conversations/show_smileys");
+	gaim_prefs_remove("/gaim/gtk/conversations/smiley_shortcuts");
 	gaim_prefs_remove("/gaim/gtk/conversations/chat/tab_completion");
 	gaim_prefs_remove("/gaim/gtk/conversations/chat/old_tab_complete");
 	gaim_prefs_remove("/gaim/gtk/sound/signon");
--- a/src/gtkrequest.c	Tue Nov 09 05:24:04 2004 +0000
+++ b/src/gtkrequest.c	Tue Nov 09 05:36:06 2004 +0000
@@ -369,8 +369,6 @@
 		gtk_widget_set_name(entry, "gaim_gtkrequest_imhtml");
 		gtk_imhtml_set_editable(GTK_IMHTML(entry), TRUE);
 
-		gtk_imhtml_smiley_shortcuts(GTK_IMHTML(entry), gaim_prefs_get_bool("/gaim/gtk/conversations/smiley_shortcuts"));
-		gtk_imhtml_html_shortcuts(GTK_IMHTML(entry), gaim_prefs_get_bool("/gaim/gtk/conversations/html_shortcuts"));
 		gtk_imhtmltoolbar_attach(GTK_IMHTMLTOOLBAR(toolbar), entry);
 
 		if (default_value != NULL)