Mercurial > pidgin.yaz
changeset 9303:fe931c791fc0
[gaim-migrate @ 10107]
Fix a comiler warning, an accelerator key, and document something.
Stu is all about keeping me on my toes.
committer: Tailor Script <tailor@pidgin.im>
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Thu, 17 Jun 2004 01:34:58 +0000 |
| parents | c45163af02fc |
| children | 96c481da57ea |
| files | plugins/ChangeLog.API plugins/notify.c src/gtkprefs.c |
| diffstat | 3 files changed, 8 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/ChangeLog.API Thu Jun 17 01:20:17 2004 +0000 +++ b/plugins/ChangeLog.API Thu Jun 17 01:34:58 2004 +0000 @@ -7,6 +7,7 @@ * Added: has_focus UI op to GaimConversationUiOps and GaimConvWindowUiOps. * Added: gaim_conversation_has_focus() and gaim_conv_window_has_focus(). + * Removed: gaim_blist_save() Plugin API: v5 * Changed: add_buddy, add_buddies, remove_buddy, remove_buddies,
--- a/plugins/notify.c Thu Jun 17 01:20:17 2004 +0000 +++ b/plugins/notify.c Thu Jun 17 01:34:58 2004 +0000 @@ -356,6 +356,7 @@ attach_signals(conv); } +#if 0 static void conv_switched(GaimConversation *old_conv, GaimConversation *new_conv) { @@ -372,6 +373,7 @@ notify_win(gaimwin); } } +#endif static void deleting_conv(GaimConversation *conv) @@ -387,6 +389,7 @@ notify_win(gaimwin); } +#if 0 static void conversation_drag_ended(GaimConversation *active_conv, GaimConvWindow *old_gaimwin, @@ -433,6 +436,7 @@ */ } } +#endif static void handle_string(GaimConvWindow *gaimwin) @@ -734,12 +738,12 @@ GAIM_CALLBACK(conv_created), NULL); gaim_signal_connect(conv_handle, "deleting-conversation", plugin, GAIM_CALLBACK(deleting_conv), NULL); - /* +#if 0 gaim_signal_connect(conv_handle, "conversation-switched", plugin, GAIM_CALLBACK(conv_switched), NULL); gaim_signal_connect(gtk_conv_handle, "conversation-drag-ended", plugin, GAIM_CALLBACK(conversation_drag_ended), NULL); - */ +#endif while (convs) { GaimConversation *conv = (GaimConversation *)convs->data;
--- a/src/gtkprefs.c Thu Jun 17 01:20:17 2004 +0000 +++ b/src/gtkprefs.c Thu Jun 17 01:34:58 2004 +0000 @@ -985,7 +985,7 @@ gaim_gtk_prefs_checkbox(_("_Raise IM window on events"), "/gaim/gtk/conversations/im/raise_on_events", vbox); - gaim_gtk_prefs_checkbox(_("_Raise chat window on events"), + gaim_gtk_prefs_checkbox(_("Raise chat _window on events"), "/gaim/gtk/conversations/chat/raise_on_events", vbox); gaim_gtk_prefs_checkbox(_("Use _multi-colored screen names in chats"), "/gaim/gtk/conversations/chat/color_nicks", vbox);