# HG changeset patch # User Daniel Atallah # Date 1178898136 0 # Node ID da9c663305ad50c60f24d37ff99ab4cde95f762d # Parent 3c145ed1f0e84b9831ede2bb47c5d98ff752c0d1# Parent 2c5654d1a17a789d93798735ffc5257ac4137803 merge of 'a43eb95550888b10562aea0fd5d585fb3b804fe5' and 'b39aa42ba764aeca02936384aed9c4447aeaf353' diff -r 3c145ed1f0e8 -r da9c663305ad libpurple/plugins/perl/common/SavedStatuses.xs --- a/libpurple/plugins/perl/common/SavedStatuses.xs Fri May 11 15:41:01 2007 +0000 +++ b/libpurple/plugins/perl/common/SavedStatuses.xs Fri May 11 15:42:16 2007 +0000 @@ -3,15 +3,6 @@ MODULE = Purple::SavedStatus PACKAGE = Purple::SavedStatus PREFIX = purple_savedstatus_ PROTOTYPES: ENABLE -void -purple_savedstatus_activate(saved_status) - Purple::SavedStatus saved_status - -void -purple_savedstatus_activate_for_account(saved_status, account) - Purple::SavedStatus saved_status - Purple::Account account - gboolean purple_savedstatus_delete(title) const char *title @@ -20,57 +11,16 @@ purple_savedstatus_find(title) const char *title -Purple::SavedStatus -purple_savedstatus_find_by_creation_time(creation_time) - time_t creation_time - -Purple::SavedStatus -purple_savedstatus_find_transient_by_type_and_message(type, message) - Purple::StatusPrimitive type - const char *message - -time_t -purple_savedstatus_get_creation_time(saved_status) - Purple::SavedStatus saved_status - -Purple::SavedStatus -purple_savedstatus_get_current() - -Purple::SavedStatus -purple_savedstatus_get_default () - -Purple::SavedStatus -purple_savedstatus_get_idleaway() - const char * purple_savedstatus_get_message(saved_status) Purple::SavedStatus saved_status -Purple::SavedStatus -purple_savedstatus_get_startup() - -Purple::SavedStatusSub -purple_savedstatus_get_substatus(saved_status, account) - Purple::SavedStatus saved_status - Purple::Account account - const char * purple_savedstatus_get_title(saved_status) Purple::SavedStatus saved_status Purple::StatusPrimitive purple_savedstatus_get_type(saved_status) - const Purple::SavedStatus saved_status - -gboolean -purple_savedstatus_has_substatuses(saved_status) - Purple::SavedStatus saved_status - -gboolean -purple_savedstatus_is_idleaway() - -gboolean -purple_savedstatus_is_transient(saved_status) Purple::SavedStatus saved_status Purple::SavedStatus @@ -79,43 +29,12 @@ Purple::StatusPrimitive type void -purple_savedstatus_set_idleaway(idleaway) - gboolean idleaway - -void purple_savedstatus_set_message(status, message) Purple::SavedStatus status const char *message -void -purple_savedstatus_set_substatus(status, account, type, message) - Purple::SavedStatus status - Purple::Account account - Purple::StatusType type - const char *message - -void -purple_savedstatus_set_title(status, title) - Purple::SavedStatus status - const char *title - -void -purple_savedstatus_set_type(status, type) - Purple::SavedStatus status - Purple::StatusPrimitive type - -const char * -purple_savedstatus_substatus_get_message(substatus) - Purple::SavedStatusSub substatus - -const Purple::StatusType -purple_savedstatus_substatus_get_type(substatus) - const Purple::SavedStatusSub substatus - -void -purple_savedstatus_unset_substatus(saved_status, account) - Purple::SavedStatus saved_status - Purple::Account account +Purple::SavedStatus +purple_savedstatus_get_current() MODULE = Purple::SavedStatus PACKAGE = Purple::SavedStatuses PREFIX = purple_savedstatuses_ PROTOTYPES: ENABLE @@ -133,16 +52,6 @@ purple_savedstatuses_get_handle() void -purple_savedstatuses_get_popular(how_many) - unsigned int how_many -PREINIT: - GList *l; -PPCODE: - for (l = purple_savedstatuses_get_popular(how_many); l != NULL; l = l->next) { - XPUSHs(sv_2mortal(purple_perl_bless_object(l->data, "Purple::SavedStatus"))); - } - -void purple_savedstatuses_init() void diff -r 3c145ed1f0e8 -r da9c663305ad libpurple/plugins/perl/common/typemap --- a/libpurple/plugins/perl/common/typemap Fri May 11 15:41:01 2007 +0000 +++ b/libpurple/plugins/perl/common/typemap Fri May 11 15:42:16 2007 +0000 @@ -137,9 +137,7 @@ Purple::RoomlistRoomType T_IV Purple::SavedStatus T_PurpleObj -const Purple::SavedStatus T_PurpleObj Purple::SavedStatusSub T_PurpleObj -const Purple::SavedStatusSub T_PurpleObj Purple::SoundEventID T_IV Purple::Sound::UiOps T_PurpleObj diff -r 3c145ed1f0e8 -r da9c663305ad pidgin/gtkblist.c --- a/pidgin/gtkblist.c Fri May 11 15:41:01 2007 +0000 +++ b/pidgin/gtkblist.c Fri May 11 15:42:16 2007 +0000 @@ -2091,28 +2091,28 @@ if (width < 6 || height < 6) return; - + /* Top left */ pixels[3] = 0; pixels[7] = 0x80; pixels[11] = 0xC0; pixels[rowstride + 3] = 0x80; pixels[rowstride * 2 + 3] = 0xC0; - + /* Top right */ pixels[width * 4 - 1] = 0; pixels[width * 4 - 5] = 0x80; pixels[width * 4 - 9] = 0xC0; pixels[rowstride + (width * 4) - 1] = 0x80; pixels[(2 * rowstride) + (width * 4) - 1] = 0xC0; - + /* Bottom left */ pixels[(height - 1) * rowstride + 3] = 0; pixels[(height - 1) * rowstride + 7] = 0x80; pixels[(height - 1) * rowstride + 11] = 0xC0; pixels[(height - 2) * rowstride + 3] = 0x80; pixels[(height - 3) * rowstride + 3] = 0xC0; - + /* Bottom right */ pixels[height * rowstride - 1] = 0; pixels[(height - 1) * rowstride - 1] = 0x80; @@ -3152,8 +3152,7 @@ if(PURPLE_BLIST_NODE_IS_CONTACT(node)) { if(!gtknode->contact_expanded) { buddy = purple_contact_get_priority_buddy((PurpleContact*)node); - if (buddy != NULL) - gtkbuddynode = ((PurpleBlistNode*)buddy)->ui_data; + gtkbuddynode = ((PurpleBlistNode*)buddy)->ui_data; } } else if(PURPLE_BLIST_NODE_IS_BUDDY(node)) { buddy = (PurpleBuddy*)node; diff -r 3c145ed1f0e8 -r da9c663305ad pidgin/gtkstatusbox.c --- a/pidgin/gtkstatusbox.c Fri May 11 15:41:01 2007 +0000 +++ b/pidgin/gtkstatusbox.c Fri May 11 15:42:16 2007 +0000 @@ -197,7 +197,7 @@ const char *message; statustype = purple_status_type_find_with_id((GList *)purple_account_get_status_types(account), - purple_status_type_get_id(purple_status_get_type(newstatus))); + (char *)purple_status_type_get_id(purple_status_get_type(newstatus))); for (l = purple_account_get_status_types(account); l != NULL; l = l->next) { PurpleStatusType *status_type = (PurpleStatusType *)l->data; @@ -1524,8 +1524,7 @@ if (ewidget != status_box->tree_view) { if (ewidget == status_box->toggle_button && status_box->popup_in_progress && - gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(status_box->toggle_button))) - { + gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (status_box->toggle_button))) { pidgin_status_box_popdown (status_box); return TRUE; } @@ -1744,11 +1743,14 @@ PURPLE_CALLBACK(current_savedstatus_changed_cb), status_box); purple_signal_connect(purple_accounts_get_handle(), "account-enabled", status_box, - PURPLE_CALLBACK(account_enabled_cb), status_box); + PURPLE_CALLBACK(account_enabled_cb), + status_box); purple_signal_connect(purple_accounts_get_handle(), "account-disabled", status_box, - PURPLE_CALLBACK(account_enabled_cb), status_box); + PURPLE_CALLBACK(account_enabled_cb), + status_box); purple_signal_connect(purple_accounts_get_handle(), "account-status-changed", status_box, - PURPLE_CALLBACK(account_status_changed_cb), status_box); + PURPLE_CALLBACK(account_status_changed_cb), + status_box); purple_prefs_connect_callback(status_box, PIDGIN_PREFS_ROOT "/conversations/spellcheck", spellcheck_prefs_cb, status_box); @@ -1967,7 +1969,8 @@ escaped_title = g_markup_escape_text(title, -1); escaped_desc = g_markup_escape_text(desc, -1); text = g_strdup_printf("%s - %s", - escaped_title, aa_color, escaped_desc); + escaped_title, + aa_color, escaped_desc); g_free(escaped_title); g_free(escaped_desc); } diff -r 3c145ed1f0e8 -r da9c663305ad pidgin/plugins/ticker/Makefile.mingw --- a/pidgin/plugins/ticker/Makefile.mingw Fri May 11 15:41:01 2007 +0000 +++ b/pidgin/plugins/ticker/Makefile.mingw Fri May 11 15:42:16 2007 +0000 @@ -59,7 +59,7 @@ all: $(TARGET).dll -install: $(PIDGIN_INSTALL_PLUGINS_DIR) all +install: $(PIDGIN_INSTALL_PLUGINS_DIR) cp $(TARGET).dll $(PIDGIN_INSTALL_PLUGINS_DIR) $(OBJECTS): $(PIDGIN_CONFIG_H)