Mercurial > pidgin
changeset 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 | a3a540ed2518 |
| files | src/gtkconv.c src/gtkprefs.c |
| diffstat | 2 files changed, 1 insertions(+), 30 deletions(-) [+] |
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",
--- a/src/gtkprefs.c Sat Jan 08 20:42:47 2005 +0000 +++ b/src/gtkprefs.c Sat Jan 08 20:51:16 2005 +0000 @@ -809,20 +809,6 @@ return ret; } -GtkWidget *hotkeys_page() { - GtkWidget *ret; - GtkWidget *vbox; - ret = gtk_vbox_new(FALSE, 18); - gtk_container_set_border_width (GTK_CONTAINER (ret), 12); - - vbox = gaim_gtk_make_frame (ret, _("Window Closing")); - gaim_gtk_prefs_checkbox(_("_Escape closes window"), - "/gaim/gtk/conversations/escape_closes", vbox); - - gtk_widget_show_all(ret); - return ret; -} - GtkWidget *list_page() { GtkWidget *ret; GtkWidget *vbox; @@ -2125,7 +2111,6 @@ prefs_notebook_add_page(_("Buddy List"), NULL, list_page(), &c, &p, notebook_page++); prefs_notebook_add_page(_("Conversations"), NULL, conv_page(), &c, &p, notebook_page++); prefs_notebook_add_page(_("Message Text"), NULL, messages_page(), &c2, &c, notebook_page++); - prefs_notebook_add_page(_("Shortcuts"), NULL, hotkeys_page(), &c2, &c, notebook_page++); prefs_notebook_add_page(_("Smiley Themes"), NULL, theme_page(), &c2, &c, notebook_page++); prefs_notebook_add_page(_("Sounds"), NULL, sound_page(), &c, &p, notebook_page++); prefs_notebook_add_page(_("Network"), NULL, network_page(), &p, NULL, notebook_page++); @@ -2360,4 +2345,5 @@ gaim_prefs_remove("/gaim/gtk/logging/individual_logs"); gaim_prefs_remove("/gaim/gtk/sound/signon"); gaim_prefs_remove("/gaim/gtk/sound/silent_signon"); + gaim_prefs_remove("/gaim/gtk/conversations/escape_closes"); }