# HG changeset patch # User Sean Egan # Date 1170490767 0 # Node ID 762b6547adf998dd03741949cb99e3cd079424a9 # Parent b53b783846a8740e56a96296a79afe4f99744510 GAIM_UNSEEN to PIDGIN_UNSEEN diff -r b53b783846a8 -r 762b6547adf9 pidgin/gtkblist.c --- a/pidgin/gtkblist.c Sat Feb 03 08:13:34 2007 +0000 +++ b/pidgin/gtkblist.c Sat Feb 03 08:19:27 2007 +0000 @@ -3476,7 +3476,7 @@ menu = NULL; } - convs = pidgin_conversations_find_unseen_list(GAIM_CONV_TYPE_IM, GAIM_UNSEEN_TEXT, TRUE, 0); + convs = pidgin_conversations_find_unseen_list(GAIM_CONV_TYPE_IM, PIDGIN_UNSEEN_TEXT, TRUE, 0); if (!convs) /* no conversations added, don't show the menu */ return; @@ -3498,7 +3498,7 @@ switch (event->button) { case 1: convs = pidgin_conversations_find_unseen_list(GAIM_CONV_TYPE_IM, - GAIM_UNSEEN_TEXT, TRUE, 1); + PIDGIN_UNSEEN_TEXT, TRUE, 1); if (convs) { pidgin_conv_present_conversation((GaimConversation*)convs->data); g_list_free(convs); @@ -3532,7 +3532,7 @@ gtkblist->menutrayicon = NULL; } - convs = pidgin_conversations_find_unseen_list(GAIM_CONV_TYPE_IM, GAIM_UNSEEN_TEXT, TRUE, 0); + convs = pidgin_conversations_find_unseen_list(GAIM_CONV_TYPE_IM, PIDGIN_UNSEEN_TEXT, TRUE, 0); if (convs) { GtkWidget *img = NULL; GString *tooltip_text = NULL; diff -r b53b783846a8 -r 762b6547adf9 pidgin/gtkconv.c --- a/pidgin/gtkconv.c Sat Feb 03 08:13:34 2007 +0000 +++ b/pidgin/gtkconv.c Sat Feb 03 08:19:27 2007 +0000 @@ -599,7 +599,7 @@ reset_default_size(gtkconv); gtkconv->entry_growing = FALSE; } - gtkconv_set_unseen(gtkconv, GAIM_UNSEEN_NONE); + gtkconv_set_unseen(gtkconv, PIDGIN_UNSEEN_NONE); } static void @@ -4546,7 +4546,7 @@ /* Setup some initial variables. */ gtkconv->sg = gtk_size_group_new(GTK_SIZE_GROUP_BOTH); gtkconv->tooltips = gtk_tooltips_new(); - gtkconv->unseen_state = GAIM_UNSEEN_NONE; + gtkconv->unseen_state = PIDGIN_UNSEEN_NONE; gtkconv->unseen_count = 0; if (conv_type == GAIM_CONV_TYPE_IM) { @@ -5162,17 +5162,17 @@ /* Tab highlighting stuff */ if (!(flags & GAIM_MESSAGE_SEND) && !pidgin_conv_has_focus(conv)) { - GaimUnseenState unseen = GAIM_UNSEEN_NONE; + GaimUnseenState unseen = PIDGIN_UNSEEN_NONE; if ((flags & GAIM_MESSAGE_NICK) == GAIM_MESSAGE_NICK) - unseen = GAIM_UNSEEN_NICK; + unseen = PIDGIN_UNSEEN_NICK; else if (((flags & GAIM_MESSAGE_SYSTEM) == GAIM_MESSAGE_SYSTEM) || ((flags & GAIM_MESSAGE_ERROR) == GAIM_MESSAGE_ERROR)) - unseen = GAIM_UNSEEN_EVENT; + unseen = PIDGIN_UNSEEN_EVENT; else if ((flags & GAIM_MESSAGE_NO_LOG) == GAIM_MESSAGE_NO_LOG) - unseen = GAIM_UNSEEN_NO_LOG; + unseen = PIDGIN_UNSEEN_NO_LOG; else - unseen = GAIM_UNSEEN_TEXT; + unseen = PIDGIN_UNSEEN_TEXT; gtkconv_set_unseen(gtkconv, unseen); } @@ -5890,17 +5890,17 @@ atk_object_set_description(accessibility_obj, _("Stopped Typing")); strncpy(style, "color=\"#D1940C\"", sizeof(style)); } - else if (gtkconv->unseen_state == GAIM_UNSEEN_NICK) + else if (gtkconv->unseen_state == PIDGIN_UNSEEN_NICK) { atk_object_set_description(accessibility_obj, _("Nick Said")); strncpy(style, "color=\"#0D4E91\" style=\"italic\" weight=\"bold\"", sizeof(style)); } - else if (gtkconv->unseen_state == GAIM_UNSEEN_TEXT) + else if (gtkconv->unseen_state == PIDGIN_UNSEEN_TEXT) { atk_object_set_description(accessibility_obj, _("Unread Messages")); strncpy(style, "color=\"#DF421E\" weight=\"bold\"", sizeof(style)); } - else if (gtkconv->unseen_state == GAIM_UNSEEN_EVENT) + else if (gtkconv->unseen_state == PIDGIN_UNSEEN_EVENT) { atk_object_set_description(accessibility_obj, _("New Event")); strncpy(style, "color=\"#868272\" style=\"italic\"", sizeof(style)); @@ -7082,7 +7082,7 @@ { PidginConversation *gtkconv = l->data; if (gaim_conversation_get_type(gtkconv->active_conv) == GAIM_CONV_TYPE_IM && - gtkconv->unseen_state >= GAIM_UNSEEN_TEXT) + gtkconv->unseen_state >= PIDGIN_UNSEEN_TEXT) { build_warn_close_dialog(win); gtk_widget_show_all(warn_close_dialog); @@ -7099,14 +7099,14 @@ static void gtkconv_set_unseen(PidginConversation *gtkconv, GaimUnseenState state) { - if (state == GAIM_UNSEEN_NONE) + if (state == PIDGIN_UNSEEN_NONE) { gtkconv->unseen_count = 0; - gtkconv->unseen_state = GAIM_UNSEEN_NONE; + gtkconv->unseen_state = PIDGIN_UNSEEN_NONE; } else { - if (state >= GAIM_UNSEEN_TEXT) + if (state >= PIDGIN_UNSEEN_TEXT) gtkconv->unseen_count++; if (state > gtkconv->unseen_state) @@ -7127,7 +7127,7 @@ PidginWindow *win = d; PidginConversation *gtkconv = pidgin_conv_window_get_active_gtkconv(win); - gtkconv_set_unseen(gtkconv, GAIM_UNSEEN_NONE); + gtkconv_set_unseen(gtkconv, PIDGIN_UNSEEN_NONE); return FALSE; } @@ -7635,7 +7635,7 @@ /* clear unseen flag if conversation is not hidden */ if(!pidgin_conv_is_hidden(gtkconv)) { - gtkconv_set_unseen(gtkconv, GAIM_UNSEEN_NONE); + gtkconv_set_unseen(gtkconv, PIDGIN_UNSEEN_NONE); } /* Update the menubar */ diff -r b53b783846a8 -r 762b6547adf9 pidgin/gtkconv.h --- a/pidgin/gtkconv.h Sat Feb 03 08:13:34 2007 +0000 +++ b/pidgin/gtkconv.h Sat Feb 03 08:19:27 2007 +0000 @@ -34,11 +34,11 @@ */ typedef enum { - GAIM_UNSEEN_NONE, /**< No unseen text in the conversation. */ - GAIM_UNSEEN_EVENT, /**< Unseen events in the conversation. */ - GAIM_UNSEEN_NO_LOG, /**< Unseen text with NO_LOG flag. */ - GAIM_UNSEEN_TEXT, /**< Unseen text in the conversation. */ - GAIM_UNSEEN_NICK /**< Unseen text and the nick was said. */ + PIDGIN_UNSEEN_NONE, /**< No unseen text in the conversation. */ + PIDGIN_UNSEEN_EVENT, /**< Unseen events in the conversation. */ + PIDGIN_UNSEEN_NO_LOG, /**< Unseen text with NO_LOG flag. */ + PIDGIN_UNSEEN_TEXT, /**< Unseen text in the conversation. */ + PIDGIN_UNSEEN_NICK /**< Unseen text and the nick was said. */ } GaimUnseenState; enum { diff -r b53b783846a8 -r 762b6547adf9 pidgin/gtkdocklet.c --- a/pidgin/gtkdocklet.c Sat Feb 03 08:13:34 2007 +0000 +++ b/pidgin/gtkdocklet.c Sat Feb 03 08:19:27 2007 +0000 @@ -94,11 +94,11 @@ GList *l_chat = NULL; l_im = pidgin_conversations_find_unseen_list(GAIM_CONV_TYPE_IM, - GAIM_UNSEEN_TEXT, + PIDGIN_UNSEEN_TEXT, FALSE, max); l_chat = pidgin_conversations_find_unseen_list(GAIM_CONV_TYPE_CHAT, - GAIM_UNSEEN_NICK, + PIDGIN_UNSEEN_NICK, FALSE, max); if (l_im != NULL && l_chat != NULL) diff -r b53b783846a8 -r 762b6547adf9 pidgin/plugins/notify.c --- a/pidgin/plugins/notify.c Sat Feb 03 08:13:34 2007 +0000 +++ b/pidgin/plugins/notify.c Sat Feb 03 08:19:27 2007 +0000 @@ -528,7 +528,7 @@ g_return_if_fail(window != NULL); if (_GaimUnseenCount == GDK_NONE) { - _GaimUnseenCount = gdk_atom_intern("_GAIM_UNSEEN_COUNT", FALSE); + _GaimUnseenCount = gdk_atom_intern("_PIDGIN_UNSEEN_COUNT", FALSE); } if (_Cardinal == GDK_NONE) {