Mercurial > pidgin
diff src/gtkconv.c @ 10489:8dffdd8861b5
[gaim-migrate @ 11779]
Removed escape-closes option.
committer: Tailor Script <tailor@pidgin.im>
| author | Sean Egan <seanegan@gmail.com> |
|---|---|
| date | Sat, 08 Jan 2005 20:51:16 +0000 |
| parents | 47366cf2792b |
| children | 6ec5da82ef41 |
line wrap: on
line diff
--- a/src/gtkconv.c Sat Jan 08 20:42:47 2005 +0000 +++ b/src/gtkconv.c Sat Jan 08 20:51:16 2005 +0000 @@ -5632,18 +5632,6 @@ } static void -escape_closes_pref_cb(const char *name, GaimPrefType type, gpointer value, - gpointer data) -{ - if (value) - gtk_accel_map_change_entry(N_("<main>/Conversation/Close"), - GDK_Escape, 0, TRUE); - else - gtk_accel_map_change_entry(N_("<main>/Conversation/Close"), - GDK_W, GDK_CONTROL_MASK, TRUE); -} - -static void close_on_tabs_pref_cb(const char *name, GaimPrefType type, gpointer value, gpointer data) { @@ -5824,7 +5812,6 @@ /* Conversations */ gaim_prefs_add_none("/gaim/gtk/conversations"); gaim_prefs_add_bool("/gaim/gtk/conversations/close_on_tabs", TRUE); - gaim_prefs_add_bool("/gaim/gtk/conversations/escape_closes", FALSE); gaim_prefs_add_bool("/gaim/gtk/conversations/send_formatting", FALSE); gaim_prefs_add_bool("/gaim/gtk/conversations/send_bold", FALSE); gaim_prefs_add_bool("/gaim/gtk/conversations/send_italic", FALSE); @@ -5866,8 +5853,6 @@ gaim_prefs_add_bool("/gaim/gtk/conversations/im/show_buddy_icons", TRUE); /* Connect callbacks. */ - gaim_prefs_connect_callback(handle, "/gaim/gtk/conversations/escape_closes", - escape_closes_pref_cb, NULL); gaim_prefs_connect_callback(handle, "/gaim/gtk/conversations/close_on_tabs", close_on_tabs_pref_cb, NULL); gaim_prefs_connect_callback(handle, "/gaim/gtk/conversations/show_formatting_toolbar",