Mercurial > pidgin.yaz
diff src/dialogs.c @ 4685:794cc8ec1166
[gaim-migrate @ 4996]
this fixes the ever-red tabs, the convo titles not switching, and some other
fun stuff. Oh, and the font-face button in the convo toolbar is back.
committer: Tailor Script <tailor@pidgin.im>
| author | Nathan Walp <nwalp@pidgin.im> |
|---|---|
| date | Mon, 10 Mar 2003 04:11:18 +0000 |
| parents | 4bf9c6e8e432 |
| children | 283fb289c510 |
line wrap: on
line diff
--- a/src/dialogs.c Mon Mar 10 03:13:01 2003 +0000 +++ b/src/dialogs.c Mon Mar 10 04:11:18 2003 +0000 @@ -279,7 +279,6 @@ gtkconv = GAIM_GTK_CONVERSATION(c); if (GTK_IS_COLOR_SELECTION_DIALOG(w)) { - gaim_gtk_set_state_lock(TRUE); if (w == gtkconv->dialogs.fg_color) { gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(gtkconv->toolbar.fgcolor), FALSE); @@ -289,24 +288,17 @@ GTK_TOGGLE_BUTTON(gtkconv->toolbar.bgcolor), FALSE); gtkconv->dialogs.bg_color = NULL; } - gaim_gtk_set_state_lock(FALSE); } else if (GTK_IS_FONT_SELECTION_DIALOG(w)) { - gaim_gtk_set_state_lock(TRUE); gtk_toggle_button_set_active( - GTK_TOGGLE_BUTTON(gtkconv->toolbar.normal_size), FALSE); - gaim_gtk_set_state_lock(FALSE); + GTK_TOGGLE_BUTTON(gtkconv->toolbar.font), FALSE); gtkconv->dialogs.font = NULL; } else if (!g_strcasecmp(object_data, "smiley dialog")) { - gaim_gtk_set_state_lock(TRUE); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(gtkconv->toolbar.smiley), FALSE); - gaim_gtk_set_state_lock(FALSE); gtkconv->dialogs.smiley = NULL; } else if (!g_strcasecmp(object_data, "log dialog")) { - gaim_gtk_set_state_lock(TRUE); gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(gtkconv->toolbar.log), FALSE); - gaim_gtk_set_state_lock(FALSE); gtkconv->dialogs.log = NULL; } @@ -2609,10 +2601,8 @@ gtkconv = GAIM_GTK_CONVERSATION(c); if (gtkconv->toolbar.log) { - gaim_gtk_set_state_lock(TRUE); gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(gtkconv->toolbar.log), FALSE); - gaim_gtk_set_state_lock(FALSE); } dialogwindows = g_list_remove(dialogwindows, gtkconv->dialogs.log); @@ -2942,14 +2932,12 @@ gtkconv = GAIM_GTK_CONVERSATION(c); if (gtkconv->toolbar.link) { - gaim_gtk_set_state_lock(TRUE); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(gtkconv->toolbar.link), FALSE); - gaim_gtk_set_state_lock(FALSE); } - destroy_dialog(NULL, gtkconv->toolbar.link); - gtkconv->toolbar.link = NULL; + destroy_dialog(NULL, gtkconv->dialogs.link); + gtkconv->dialogs.link = NULL; } void do_insert_link(GtkWidget *w, int resp, struct linkdlg *b) @@ -2977,10 +2965,8 @@ } if (gtkconv->toolbar.link) { - gaim_gtk_set_state_lock(TRUE); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(gtkconv->toolbar.link), FALSE); - gaim_gtk_set_state_lock(FALSE); } gtkconv->dialogs.link = NULL; @@ -3096,10 +3082,8 @@ gtkconv = GAIM_GTK_CONVERSATION(c); if (gtkconv->toolbar.fgcolor && widget) { - gaim_gtk_set_state_lock(TRUE); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(gtkconv->toolbar.fgcolor), FALSE); - gaim_gtk_set_state_lock(FALSE); } dialogwindows = g_list_remove(dialogwindows, gtkconv->dialogs.fg_color); @@ -3114,10 +3098,8 @@ gtkconv = GAIM_GTK_CONVERSATION(c); if (gtkconv->toolbar.bgcolor && widget) { - gaim_gtk_set_state_lock(TRUE); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(gtkconv->toolbar.bgcolor), FALSE); - gaim_gtk_set_state_lock(FALSE); } dialogwindows = g_list_remove(dialogwindows, gtkconv->dialogs.bg_color); @@ -3291,11 +3273,9 @@ gtkconv = GAIM_GTK_CONVERSATION(c); - if (gtkconv->toolbar.normal_size && widget) { - gaim_gtk_set_state_lock(TRUE); + if (gtkconv->toolbar.font && widget) { gtk_toggle_button_set_active( - GTK_TOGGLE_BUTTON(gtkconv->toolbar.normal_size), FALSE); - gaim_gtk_set_state_lock(FALSE); + GTK_TOGGLE_BUTTON(gtkconv->toolbar.font), FALSE); } dialogwindows = g_list_remove(dialogwindows, gtkconv->dialogs.font); @@ -3701,10 +3681,8 @@ gtkconv = GAIM_GTK_CONVERSATION(c); if (gtkconv->toolbar.smiley) { - gaim_gtk_set_state_lock(TRUE); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(gtkconv->toolbar.smiley), FALSE); - gaim_gtk_set_state_lock(FALSE); } dialogwindows = g_list_remove(dialogwindows, gtkconv->dialogs.smiley); gtk_widget_destroy(gtkconv->dialogs.smiley);