Mercurial > pidgin
comparison pidgin/gtkconv.c @ 32805:997570b274d1
Remove the timestamps toggle. This can be done with themes.
author | Elliott Sales de Andrade <qulogic@pidgin.im> |
---|---|
date | Mon, 28 May 2012 22:13:56 +0000 |
parents | b37309823450 |
children | 0dd2cbee5b80 |
comparison
equal
deleted
inserted
replaced
32804:1056a2803806 | 32805:997570b274d1 |
---|---|
1506 if (node) | 1506 if (node) |
1507 purple_blist_node_set_bool(node, "gtk-mute-sound", !gtkconv->make_sound); | 1507 purple_blist_node_set_bool(node, "gtk-mute-sound", !gtkconv->make_sound); |
1508 } | 1508 } |
1509 | 1509 |
1510 static void | 1510 static void |
1511 menu_timestamps_cb(GtkAction *action, gpointer data) | |
1512 { | |
1513 purple_prefs_set_bool(PIDGIN_PREFS_ROOT "/conversations/show_timestamps", | |
1514 gtk_toggle_action_get_active(GTK_TOGGLE_ACTION(action))); | |
1515 } | |
1516 | |
1517 static void | |
1518 chat_do_im(PidginConversation *gtkconv, const char *who) | 1511 chat_do_im(PidginConversation *gtkconv, const char *who) |
1519 { | 1512 { |
1520 PurpleConversation *conv = gtkconv->active_conv; | 1513 PurpleConversation *conv = gtkconv->active_conv; |
1521 PurpleAccount *account; | 1514 PurpleAccount *account; |
1522 PurpleConnection *gc; | 1515 PurpleConnection *gc; |
3166 /* Toggle items */ | 3159 /* Toggle items */ |
3167 static const GtkToggleActionEntry menu_toggle_entries[] = { | 3160 static const GtkToggleActionEntry menu_toggle_entries[] = { |
3168 { "EnableLogging", NULL, N_("Enable _Logging"), NULL, NULL, G_CALLBACK(menu_logging_cb), FALSE }, | 3161 { "EnableLogging", NULL, N_("Enable _Logging"), NULL, NULL, G_CALLBACK(menu_logging_cb), FALSE }, |
3169 { "EnableSounds", NULL, N_("Enable _Sounds"), NULL, NULL, G_CALLBACK(menu_sounds_cb), FALSE }, | 3162 { "EnableSounds", NULL, N_("Enable _Sounds"), NULL, NULL, G_CALLBACK(menu_sounds_cb), FALSE }, |
3170 { "ShowFormattingToolbars", NULL, N_("Show Formatting _Toolbars"), NULL, NULL, G_CALLBACK(menu_toolbar_cb), FALSE }, | 3163 { "ShowFormattingToolbars", NULL, N_("Show Formatting _Toolbars"), NULL, NULL, G_CALLBACK(menu_toolbar_cb), FALSE }, |
3171 { "ShowTimestamps", NULL, N_("Show Ti_mestamps"), NULL, NULL, G_CALLBACK(menu_timestamps_cb), FALSE }, | |
3172 }; | 3164 }; |
3173 | 3165 |
3174 static const char *conversation_menu = | 3166 static const char *conversation_menu = |
3175 "<ui>" | 3167 "<ui>" |
3176 "<menubar name='Conversation'>" | 3168 "<menubar name='Conversation'>" |
3211 "<menu action='OptionsMenu'>" | 3203 "<menu action='OptionsMenu'>" |
3212 "<menuitem action='EnableLogging'/>" | 3204 "<menuitem action='EnableLogging'/>" |
3213 "<menuitem action='EnableSounds'/>" | 3205 "<menuitem action='EnableSounds'/>" |
3214 "<separator/>" | 3206 "<separator/>" |
3215 "<menuitem action='ShowFormattingToolbars'/>" | 3207 "<menuitem action='ShowFormattingToolbars'/>" |
3216 "<menuitem action='ShowTimestamps'/>" | |
3217 "</menu>" | 3208 "</menu>" |
3218 "</menubar>" | 3209 "</menubar>" |
3219 "</ui>"; | 3210 "</ui>"; |
3220 | 3211 |
3221 static void | 3212 static void |
3700 sound_method_pref_changed_cb, win); | 3691 sound_method_pref_changed_cb, win); |
3701 | 3692 |
3702 win->menu.show_formatting_toolbar = | 3693 win->menu.show_formatting_toolbar = |
3703 gtk_ui_manager_get_action(win->menu.ui, | 3694 gtk_ui_manager_get_action(win->menu.ui, |
3704 "/Conversation/OptionsMenu/ShowFormattingToolbars"); | 3695 "/Conversation/OptionsMenu/ShowFormattingToolbars"); |
3705 win->menu.show_timestamps = | |
3706 gtk_ui_manager_get_action(win->menu.ui, | |
3707 "/Conversation/OptionsMenu/ShowTimestamps"); | |
3708 | 3696 |
3709 win->menu.tray = pidgin_menu_tray_new(); | 3697 win->menu.tray = pidgin_menu_tray_new(); |
3710 gtk_menu_shell_append(GTK_MENU_SHELL(win->menu.menubar), | 3698 gtk_menu_shell_append(GTK_MENU_SHELL(win->menu.menubar), |
3711 win->menu.tray); | 3699 win->menu.tray); |
3712 gtk_widget_show(win->menu.tray); | 3700 gtk_widget_show(win->menu.tray); |
7854 } | 7842 } |
7855 } | 7843 } |
7856 } | 7844 } |
7857 | 7845 |
7858 static void | 7846 static void |
7859 show_timestamps_pref_cb(const char *name, PurplePrefType type, | |
7860 gconstpointer value, gpointer data) | |
7861 { | |
7862 GList *l; | |
7863 PurpleConversation *conv; | |
7864 PidginConversation *gtkconv; | |
7865 PidginWindow *win; | |
7866 | |
7867 for (l = purple_get_conversations(); l != NULL; l = l->next) | |
7868 { | |
7869 conv = (PurpleConversation *)l->data; | |
7870 | |
7871 if (!PIDGIN_IS_PIDGIN_CONVERSATION(conv)) | |
7872 continue; | |
7873 | |
7874 gtkconv = PIDGIN_CONVERSATION(conv); | |
7875 win = gtkconv->win; | |
7876 | |
7877 gtk_toggle_action_set_active( | |
7878 GTK_TOGGLE_ACTION(win->menu.show_timestamps), | |
7879 (gboolean)GPOINTER_TO_INT(value)); | |
7880 | |
7881 /* TODO WEBKIT: Use WebKit version of this. */ | |
7882 #if 0 | |
7883 gtk_imhtml_show_comments(GTK_IMHTML(gtkconv->imhtml), | |
7884 (gboolean)GPOINTER_TO_INT(value)); | |
7885 #endif /* if 0 */ | |
7886 } | |
7887 } | |
7888 | |
7889 static void | |
7890 show_formatting_toolbar_pref_cb(const char *name, PurplePrefType type, | 7847 show_formatting_toolbar_pref_cb(const char *name, PurplePrefType type, |
7891 gconstpointer value, gpointer data) | 7848 gconstpointer value, gpointer data) |
7892 { | 7849 { |
7893 GList *l; | 7850 GList *l; |
7894 PurpleConversation *conv; | 7851 PurpleConversation *conv; |
8454 purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/conversations/show_incoming_formatting", TRUE); | 8411 purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/conversations/show_incoming_formatting", TRUE); |
8455 purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/conversations/resize_custom_smileys", TRUE); | 8412 purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/conversations/resize_custom_smileys", TRUE); |
8456 purple_prefs_add_int(PIDGIN_PREFS_ROOT "/conversations/custom_smileys_size", 96); | 8413 purple_prefs_add_int(PIDGIN_PREFS_ROOT "/conversations/custom_smileys_size", 96); |
8457 purple_prefs_add_int(PIDGIN_PREFS_ROOT "/conversations/minimum_entry_lines", 2); | 8414 purple_prefs_add_int(PIDGIN_PREFS_ROOT "/conversations/minimum_entry_lines", 2); |
8458 | 8415 |
8459 purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/conversations/show_timestamps", TRUE); | |
8460 purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/conversations/show_formatting_toolbar", TRUE); | 8416 purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/conversations/show_formatting_toolbar", TRUE); |
8461 | 8417 |
8462 purple_prefs_add_string(PIDGIN_PREFS_ROOT "/conversations/placement", "last"); | 8418 purple_prefs_add_string(PIDGIN_PREFS_ROOT "/conversations/placement", "last"); |
8463 purple_prefs_add_int(PIDGIN_PREFS_ROOT "/conversations/placement_number", 1); | 8419 purple_prefs_add_int(PIDGIN_PREFS_ROOT "/conversations/placement_number", 1); |
8464 purple_prefs_add_string(PIDGIN_PREFS_ROOT "/conversations/bgcolor", ""); | 8420 purple_prefs_add_string(PIDGIN_PREFS_ROOT "/conversations/bgcolor", ""); |
8503 #endif | 8459 #endif |
8504 | 8460 |
8505 /* Connect callbacks. */ | 8461 /* Connect callbacks. */ |
8506 purple_prefs_connect_callback(handle, PIDGIN_PREFS_ROOT "/conversations/close_on_tabs", | 8462 purple_prefs_connect_callback(handle, PIDGIN_PREFS_ROOT "/conversations/close_on_tabs", |
8507 close_on_tabs_pref_cb, NULL); | 8463 close_on_tabs_pref_cb, NULL); |
8508 purple_prefs_connect_callback(handle, PIDGIN_PREFS_ROOT "/conversations/show_timestamps", | |
8509 show_timestamps_pref_cb, NULL); | |
8510 purple_prefs_connect_callback(handle, PIDGIN_PREFS_ROOT "/conversations/show_formatting_toolbar", | 8464 purple_prefs_connect_callback(handle, PIDGIN_PREFS_ROOT "/conversations/show_formatting_toolbar", |
8511 show_formatting_toolbar_pref_cb, NULL); | 8465 show_formatting_toolbar_pref_cb, NULL); |
8512 purple_prefs_connect_callback(handle, PIDGIN_PREFS_ROOT "/conversations/spellcheck", | 8466 purple_prefs_connect_callback(handle, PIDGIN_PREFS_ROOT "/conversations/spellcheck", |
8513 spellcheck_pref_cb, NULL); | 8467 spellcheck_pref_cb, NULL); |
8514 purple_prefs_connect_callback(handle, PIDGIN_PREFS_ROOT "/conversations/tab_side", | 8468 purple_prefs_connect_callback(handle, PIDGIN_PREFS_ROOT "/conversations/tab_side", |
9716 gtkconv->make_sound); | 9670 gtkconv->make_sound); |
9717 | 9671 |
9718 gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(win->menu.show_formatting_toolbar), | 9672 gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(win->menu.show_formatting_toolbar), |
9719 purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/show_formatting_toolbar")); | 9673 purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/show_formatting_toolbar")); |
9720 | 9674 |
9721 gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(win->menu.show_timestamps), | |
9722 purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/show_timestamps")); | |
9723 | |
9724 /* | 9675 /* |
9725 * We pause icons when they are not visible. If this icon should | 9676 * We pause icons when they are not visible. If this icon should |
9726 * be animated then start it back up again. | 9677 * be animated then start it back up again. |
9727 */ | 9678 */ |
9728 if ((purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM) && | 9679 if ((purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM) && |