HGKeeper

pidgin/purple-plugin-pack

Improve compatibility with Pidgin 3

2012-01-18, Richard Laager

10ae2f408c94

Parents 5d2e8d3af14c
Children 27b7725dad65

Improve compatibility with Pidgin 3

13 files changed, 73 insertions(+), 21 deletions(-)

+2 -2

autoprofile/comp_logstats.c

+2 -1

autoprofile/gtk_away_msgs.c

+7 -1

difftopic/difftopic.c

+11 -4

flip/flip.c

+11 -4

google/google.c

+11 -4

irssi/datechange.c

+7 -1

irssi/lastlog.c

+4 -0

listhandler/aim_blt_files.c

+4 -0

listhandler/lh_util.c

+4 -0

listhandler/migrate.c

+5 -1

splitter/splitter.c

+4 -2

switchspell/switchspell.c

+1 -1

xmppprio/xmppprio.c

~~--- a/autoprofile/comp_logstats.c Wed Jan 18 22:20:15 2012 -0600~~

+++ b/autoprofile/comp_logstats.c Wed Jan 18 22:20:42 2012 -0600

@@ -678,9 +678,9 @@

struct log_date *the_date;

struct conversation_time *the_time;

~~- if (conv->type == PURPLE_CONV_TYPE_IM) {~~

+ if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM) {

the_time = malloc (sizeof(struct conversation_time));

~~- the_time->name = strdup (conv->name);~~

+ the_time->name = strdup (purple_conversation_get_name(conv));

the_time->start_time = malloc (sizeof(time_t));

time (the_time->start_time);

~~--- a/autoprofile/gtk_away_msgs.c Wed Jan 18 22:20:15 2012 -0600~~

+++ b/autoprofile/gtk_away_msgs.c Wed Jan 18 22:20:42 2012 -0600

@@ -234,7 +234,8 @@

imhtml = gtk_imhtml_new (NULL, NULL);

/* Create main display window */

~~- PIDGIN_DIALOG(dialog);~~

+ dialog = gtk_window_new (GTK_WINDOW_TOPLEVEL);

+ gtk_window_set_type_hint (GTK_WINDOW(dialog), GDK_WINDOW_TYPE_HINT_DIALOG);

gtk_window_set_title (GTK_WINDOW(dialog), _("AutoProfile Summary"));

gtk_widget_realize (dialog);

~~--- a/difftopic/difftopic.c Wed Jan 18 22:20:15 2012 -0600~~

+++ b/difftopic/difftopic.c Wed Jan 18 22:20:42 2012 -0600

@@ -150,9 +150,15 @@

static void

topic_changed(PurpleConversation *conv, const char *who, const char *what)

{

~~- PidginConversation *gtkconv = conv->ui_data;~~

+ PidginConversation *gtkconv;

char *old;

+#if PURPLE_VERSION_CHECK(3,0,0)

+ gtkconv = purple_conversation_get_ui_data(conv);

+#else

+ gtkconv = conv->ui_data;

+#endif

old = g_object_get_data(G_OBJECT(gtkconv->imhtml), "difftopic");

if (old && what) {

have_fun(GTK_IMHTML(gtkconv->imhtml), old, what);

~~--- a/flip/flip.c Wed Jan 18 22:20:15 2012 -0600~~

+++ b/flip/flip.c Wed Jan 18 22:20:42 2012 -0600

@@ -42,10 +42,17 @@

msg = g_strdup_printf("Flips a coin: %s", (heads) ? "HEADS" : "TAILS");

~~- if(conv->type == PURPLE_CONV_TYPE_IM)~~

~~- purple_conv_im_send(PURPLE_CONV_IM(conv), msg);~~

~~- else if(conv->type == PURPLE_CONV_TYPE_CHAT)~~

~~- purple_conv_chat_send(PURPLE_CONV_CHAT(conv), msg);~~

+ switch (purple_conversation_get_type(conv))

+ {

+ case PURPLE_CONV_TYPE_IM:

+ purple_conv_im_send(PURPLE_CONV_IM(conv), msg);

+ break;

+ case PURPLE_CONV_TYPE_CHAT:

+ purple_conv_chat_send(PURPLE_CONV_CHAT(conv), msg);

+ break;

+ default:

+ break;

+ }

g_free(msg);

~~--- a/google/google.c Wed Jan 18 22:20:15 2012 -0600~~

+++ b/google/google.c Wed Jan 18 22:20:42 2012 -0600

@@ -126,10 +126,17 @@

*url_e = '\0';

~~- if(gfud->conv->type == PURPLE_CONV_TYPE_IM)~~

~~- purple_conv_im_send(PURPLE_CONV_IM(gfud->conv), url_s);~~

~~- else if(gfud->conv->type == PURPLE_CONV_TYPE_CHAT)~~

~~- purple_conv_chat_send(PURPLE_CONV_CHAT(gfud->conv), url_s);~~

+ switch (purple_conversation_get_type(gfud->conv))

+ {

+ case PURPLE_CONV_TYPE_IM:

+ purple_conv_im_send(PURPLE_CONV_IM(gfud->conv), url_s);

+ break;

+ case PURPLE_CONV_TYPE_CHAT:

+ purple_conv_chat_send(PURPLE_CONV_CHAT(gfud->conv), url_s);

+ break;

+ default:

+ break;

+ }

}

/******************************************************************************

~~--- a/irssi/datechange.c Wed Jan 18 22:20:15 2012 -0600~~

+++ b/irssi/datechange.c Wed Jan 18 22:20:42 2012 -0600

@@ -95,10 +95,17 @@

t);

if(new_year) {

~~- if(conv->type == PURPLE_CONV_TYPE_IM)~~

~~- purple_conv_im_send(PURPLE_CONV_IM(conv), new_year);~~

~~- else if(conv->type == PURPLE_CONV_TYPE_CHAT)~~

~~- purple_conv_chat_send(PURPLE_CONV_CHAT(conv), new_year);~~

+ switch (purple_conversation_get_type(conv))

+ {

+ case PURPLE_CONV_TYPE_IM:

+ purple_conv_im_send(PURPLE_CONV_IM(conv), new_year);

+ break;

+ case PURPLE_CONV_TYPE_CHAT:

+ purple_conv_chat_send(PURPLE_CONV_CHAT(conv), new_year);

+ break;

+ default:

+ break;

+ }

}

~~--- a/irssi/lastlog.c Wed Jan 18 22:20:15 2012 -0600~~

+++ b/irssi/lastlog.c Wed Jan 18 22:20:42 2012 -0600

@@ -44,11 +44,17 @@

*****************************************************************************/

static void

irssi_lastlog(PurpleConversation *c, const gchar *needle) {

~~- PidginConversation *gtkconv = c->ui_data;~~

+ PidginConversation *gtkconv;

int i;

GString *result;

char **lines;

+#if PURPLE_VERSION_CHECK(3,0,0)

+ gtkconv = purple_conversation_get_ui_data(c);

+#else

+ gtkconv = c->ui_data;

+#endif

/* let's avoid some warnings on anal C compilers like mipspro cc */

result = g_string_new(NULL);

lines = gtk_imhtml_get_markup_lines(GTK_IMHTML(gtkconv->imhtml));

~~--- a/listhandler/aim_blt_files.c Wed Jan 18 22:20:15 2012 -0600~~

+++ b/listhandler/aim_blt_files.c Wed Jan 18 22:20:42 2012 -0600

@@ -218,7 +218,11 @@

if(buddies && groups) {

lh_util_add_to_blist(buddies, groups);

+#if PURPLE_VERSION_CHECK(3,0,0)

+ purple_account_add_buddies(target_account, buddies, NULL);

+#else

purple_account_add_buddies(target_account, buddies);

+#endif

} else {

if(!buddies && !groups)

purple_debug_info("listhandler: import", "BOTH GLISTS NULL!!!!!\n");

~~--- a/listhandler/lh_util.c Wed Jan 18 22:20:15 2012 -0600~~

+++ b/listhandler/lh_util.c Wed Jan 18 22:20:42 2012 -0600

@@ -36,7 +36,11 @@

node = (PurpleBlistNode *)purple_buddy;

purple_blist_add_buddy(purple_buddy, NULL, purple_group, NULL);

+#if PURPLE_VERSION_CHECK(3,0,0)

+ purple_account_add_buddy(account, purple_buddy, NULL);

+#else

purple_account_add_buddy(account, purple_buddy);

+#endif

if(buddynotes)

purple_blist_node_set_string(node, "notes", buddynotes);

~~--- a/listhandler/migrate.c Wed Jan 18 22:20:15 2012 -0600~~

+++ b/listhandler/migrate.c Wed Jan 18 22:20:42 2012 -0600

@@ -95,7 +95,11 @@

lh_util_add_to_blist(buddies, groups);

/* add the buddies to the server-side list */

+#if PURPLE_VERSION_CHECK(3,0,0)

+ purple_account_add_buddies(target_account, buddies, NULL);

+#else

purple_account_add_buddies(target_account, buddies);

+#endif

/* now free the lists that were created */

g_list_free(buddies);

~~--- a/splitter/splitter.c Wed Jan 18 22:20:15 2012 -0600~~

+++ b/splitter/splitter.c Wed Jan 18 22:20:42 2012 -0600

@@ -131,14 +131,18 @@

return;

account = purple_conversation_get_account(conv);

+#if PURPLE_VERSION_CHECK(3,0,0)

+ gc = purple_conversation_get_connection(conv);

+#else

gc = purple_conversation_get_gc(conv);

+#endif

g_return_if_fail(account != NULL);

g_return_if_fail(gc != NULL);

type = purple_conversation_get_type(conv);

~~- if ((conv->features & PURPLE_CONNECTION_HTML) &&~~

+ if ((purple_conversation_get_features(conv) & PURPLE_CONNECTION_HTML) &&

!(msgflags & PURPLE_MESSAGE_RAW))

{

sent = purple_markup_linkify(message);

~~--- a/switchspell/switchspell.c Wed Jan 18 22:20:15 2012 -0600~~

+++ b/switchspell/switchspell.c Wed Jan 18 22:20:42 2012 -0600

@@ -49,17 +49,19 @@

blist_node_for_conv(PurpleConversation *conv)

{

PurpleBlistNode *node = NULL;

+ PurpleAccount *account = purple_conversation_get_account(conv);

+ const char *name = purple_conversation_get_name(conv);

switch (purple_conversation_get_type(conv)) {

case PURPLE_CONV_TYPE_IM:

{

~~- PurpleBuddy *buddy = purple_find_buddy(conv->account, conv->name);~~

+ PurpleBuddy *buddy = purple_find_buddy(account, name);

if (buddy)

node = (PurpleBlistNode *)purple_buddy_get_contact(buddy);

break;

}

case PURPLE_CONV_TYPE_CHAT:

~~- node = (PurpleBlistNode *)purple_blist_find_chat(conv->account, conv->name);~~

+ node = (PurpleBlistNode *)purple_blist_find_chat(account, name);

break;

default:

break;

~~--- a/xmppprio/xmppprio.c Wed Jan 18 22:20:15 2012 -0600~~

+++ b/xmppprio/xmppprio.c Wed Jan 18 22:20:42 2012 -0600

@@ -73,7 +73,7 @@

continue;

default_value = purple_status_attr_get_value(attr);

~~- if (default_value->type == PURPLE_TYPE_INT) {~~

+ if (purple_value_get_type(default_value) == PURPLE_TYPE_INT) {

if (purple_status_type_is_available(type))

purple_value_set_int(default_value, avail_prio);

else