pidgin: 49c0344b: Use the new accessor functions of Pidgin...
andrew.victor at mxit.com
andrew.victor at mxit.com
Tue Aug 30 18:26:04 EDT 2011
----------------------------------------------------------------------
Revision: 49c0344b0fbfdcf6f15806030752ef761a959eae
Parent: a4b2e618587494a1f9d9bd8e874f696175aac31a
Author: andrew.victor at mxit.com
Date: 08/30/11 18:07:19
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/49c0344b0fbfdcf6f15806030752ef761a959eae
Changelog:
Use the new accessor functions of PidginWhiteboard.
Changes against parent a4b2e618587494a1f9d9bd8e874f696175aac31a
patched ChangeLog.API
patched libpurple/protocols/silc/wb.c
patched libpurple/protocols/yahoo/yahoo_doodle.c
patched pidgin/gtkwhiteboard.c
-------------- next part --------------
============================================================
--- ChangeLog.API a3fc0a359a63df05b35df6e0ed42243e823aaff8
+++ ChangeLog.API 65d7b8ed5d61d7f2294b5bb31023da92af435d3b
@@ -20,10 +20,16 @@ version 3.0.0 (??/??/????):
* purple_roomlist_room_set_expanded_once
* purple_roomlist_set_proto_data
* purple_roomlist_set_ui_data
+ * purple_whiteboard_get_account
+ * purple_whiteboard_get_draw_list
+ * purple_whiteboard_set_draw_list
* purple_whiteboard_get_protocol_data
* purple_whiteboard_set_protocol_data
+ * purple_whiteboard_get_state
+ * purple_whiteboard_set_state
* purple_whiteboard_get_ui_data
* purple_whiteboard_set_ui_data
+ * purple_whiteboard_get_who
* purple_xfer_get_protocol_data
* purple_xfer_get_ui_data
* purple_xfer_set_protocol_data
============================================================
--- pidgin/gtkwhiteboard.c 23ba5e978f3cdc281aa0fe35e80a3dcb58e4777c
+++ pidgin/gtkwhiteboard.c 15130faa0225d3608af0755d8b9bbc3a1fc00f7d
@@ -125,7 +125,7 @@ static void pidgin_whiteboard_create(Pur
PidginWhiteboard *gtkwb = g_new0(PidginWhiteboard, 1);
gtkwb->wb = wb;
- wb->ui_data = gtkwb;
+ purple_whiteboard_set_ui_data(wb, gtkwb);
/* Get dimensions (default?) for the whiteboard canvas */
if (!purple_whiteboard_get_dimensions(wb, >kwb->width, >kwb->height))
@@ -145,11 +145,11 @@ static void pidgin_whiteboard_create(Pur
/* Try and set window title as the name of the buddy, else just use their
* username
*/
- buddy = purple_find_buddy(wb->account, wb->who);
+ buddy = purple_find_buddy(purple_whiteboard_get_account(wb), purple_whiteboard_get_who(wb));
- window = pidgin_create_window(buddy != NULL ? purple_buddy_get_contact_alias(buddy) : wb->who, 0, NULL, FALSE);
+ window = pidgin_create_window(buddy != NULL ? purple_buddy_get_contact_alias(buddy) : purple_whiteboard_get_who(wb), 0, NULL, FALSE);
gtkwb->window = window;
- gtk_widget_set_name(window, wb->who);
+ gtk_widget_set_name(window, purple_whiteboard_get_who(wb));
g_signal_connect(G_OBJECT(window), "delete_event",
G_CALLBACK(whiteboard_close_cb), gtkwb);
@@ -274,7 +274,7 @@ static void pidgin_whiteboard_destroy(Pu
GtkWidget *colour_dialog;
g_return_if_fail(wb != NULL);
- gtkwb = wb->ui_data;
+ gtkwb = purple_whiteboard_get_ui_data(wb);
g_return_if_fail(gtkwb != NULL);
/* TODO Ask if user wants to save picture before the session is closed */
@@ -301,7 +301,7 @@ static void pidgin_whiteboard_destroy(Pu
gtkwb->window = NULL;
}
g_free(gtkwb);
- wb->ui_data = NULL;
+ purple_whiteboard_set_ui_data(wb, NULL);
}
static gboolean whiteboard_close_cb(GtkWidget *widget, GdkEvent *event, PidginWhiteboard *gtkwb)
@@ -406,7 +406,7 @@ static gboolean pidgin_whiteboard_brush_
GdkPixmap *pixmap = gtkwb->pixmap;
PurpleWhiteboard *wb = gtkwb->wb;
- GList *draw_list = wb->draw_list;
+ GList *draw_list = purple_whiteboard_get_draw_list(wb);
if(BrushState != BRUSH_STATE_UP)
{
@@ -441,7 +441,7 @@ static gboolean pidgin_whiteboard_brush_
gtkwb->brush_color, gtkwb->brush_size);
}
- wb->draw_list = draw_list;
+ purple_whiteboard_set_draw_list(wb, draw_list);
return TRUE;
}
@@ -459,7 +459,7 @@ static gboolean pidgin_whiteboard_brush_
GdkPixmap *pixmap = gtkwb->pixmap;
PurpleWhiteboard *wb = gtkwb->wb;
- GList *draw_list = wb->draw_list;
+ GList *draw_list = purple_whiteboard_get_draw_list(wb);
if(event->is_hint)
gdk_window_get_pointer(event->window, &x, &y, &state);
@@ -528,7 +528,7 @@ static gboolean pidgin_whiteboard_brush_
LastY = y;
}
- wb->draw_list = draw_list;
+ purple_whiteboard_set_draw_list(wb, draw_list);
return TRUE;
}
@@ -539,7 +539,7 @@ static gboolean pidgin_whiteboard_brush_
GdkPixmap *pixmap = gtkwb->pixmap;
PurpleWhiteboard *wb = gtkwb->wb;
- GList *draw_list = wb->draw_list;
+ GList *draw_list = purple_whiteboard_get_draw_list(wb);
if((BrushState != BRUSH_STATE_DOWN) && (BrushState != BRUSH_STATE_MOTION))
{
@@ -583,7 +583,7 @@ static gboolean pidgin_whiteboard_brush_
if(draw_list)
purple_whiteboard_draw_list_destroy(draw_list);
- wb->draw_list = NULL;
+ purple_whiteboard_set_draw_list(wb, NULL);
}
return TRUE;
@@ -591,7 +591,7 @@ static void pidgin_whiteboard_draw_brush
static void pidgin_whiteboard_draw_brush_point(PurpleWhiteboard *wb, int x, int y, int color, int size)
{
- PidginWhiteboard *gtkwb = wb->ui_data;
+ PidginWhiteboard *gtkwb = purple_whiteboard_get_ui_data(wb);
GtkWidget *widget = gtkwb->drawing_area;
GdkPixmap *pixmap = gtkwb->pixmap;
@@ -684,7 +684,7 @@ static void pidgin_whiteboard_set_dimens
static void pidgin_whiteboard_set_dimensions(PurpleWhiteboard *wb, int width, int height)
{
- PidginWhiteboard *gtkwb = wb->ui_data;
+ PidginWhiteboard *gtkwb = purple_whiteboard_get_ui_data(wb);
gtkwb->width = width;
gtkwb->height = height;
@@ -692,7 +692,7 @@ static void pidgin_whiteboard_set_brush(
static void pidgin_whiteboard_set_brush(PurpleWhiteboard *wb, int size, int color)
{
- PidginWhiteboard *gtkwb = wb->ui_data;
+ PidginWhiteboard *gtkwb = purple_whiteboard_get_ui_data(wb);
gtkwb->brush_size = size;
gtkwb->brush_color = color;
@@ -700,7 +700,7 @@ static void pidgin_whiteboard_clear(Purp
static void pidgin_whiteboard_clear(PurpleWhiteboard *wb)
{
- PidginWhiteboard *gtkwb = wb->ui_data;
+ PidginWhiteboard *gtkwb = purple_whiteboard_get_ui_data(wb);
GdkPixmap *pixmap = gtkwb->pixmap;
GtkWidget *drawing_area = gtkwb->drawing_area;
cairo_t *cr = g_object_get_data(G_OBJECT(pixmap), "cairo-context");
============================================================
--- libpurple/protocols/yahoo/yahoo_doodle.c 2f9d4cca29143a925fce85d21c9dfb9a72201367
+++ libpurple/protocols/yahoo/yahoo_doodle.c 3b344a61eeb99f4568d529ab1207493e4f766355
@@ -189,19 +189,19 @@ static void yahoo_doodle_command_got_rea
if(wb == NULL)
return;
- if(wb->state == DOODLE_STATE_REQUESTING)
+ if(purple_whiteboard_get_state(wb) == DOODLE_STATE_REQUESTING)
{
doodle_session *ds = purple_whiteboard_get_protocol_data(wb);
purple_whiteboard_start(wb);
- wb->state = DOODLE_STATE_ESTABLISHED;
+ purple_whiteboard_set_state(wb, DOODLE_STATE_ESTABLISHED);
yahoo_doodle_command_send_confirm(gc, from, imv_key);
/* Let's steal the imv_key and reuse it */
g_free(ds->imv_key);
ds->imv_key = g_strdup(imv_key);
}
- else if(wb->state == DOODLE_STATE_ESTABLISHED)
+ else if(purple_whiteboard_get_state(wb) == DOODLE_STATE_ESTABLISHED)
{
/* TODO Ask whether to save picture too */
purple_whiteboard_clear(wb);
@@ -211,7 +211,7 @@ static void yahoo_doodle_command_got_rea
* already thinks we're in a session with them (when their chat message
* contains the doodle imv key)
*/
- else if(wb->state == DOODLE_STATE_REQUESTED)
+ else if(purple_whiteboard_get_state(wb) == DOODLE_STATE_REQUESTED)
{
/* purple_whiteboard_start(wb); */
yahoo_doodle_command_send_ready(gc, from, imv_key);
@@ -292,7 +292,7 @@ static void yahoo_doodle_command_got_cle
if(wb == NULL)
return;
- if(wb->state == DOODLE_STATE_ESTABLISHED)
+ if(purple_whiteboard_get_state(wb) == DOODLE_STATE_ESTABLISHED)
{
/* TODO Ask user whether to save the image before clearing it */
@@ -333,9 +333,9 @@ static void yahoo_doodle_command_got_con
/* TODO Combine the following IF's? */
/* Check if we requested a doodle session */
- /*if(wb->state == DOODLE_STATE_REQUESTING)
+ /*if(purple_whiteboard_get_state(wb) == DOODLE_STATE_REQUESTING)
{
- wb->state = DOODLE_STATE_ESTABLISHED;
+ purple_whiteboard_set_state(wb, DOODLE_STATE_ESTABLISHED);
purple_whiteboard_start(wb);
@@ -343,9 +343,9 @@ static void yahoo_doodle_command_got_con
}*/
/* Check if we accepted a request for a doodle session */
- if(wb->state == DOODLE_STATE_REQUESTED)
+ if(purple_whiteboard_get_state(wb) == DOODLE_STATE_REQUESTED)
{
- wb->state = DOODLE_STATE_ESTABLISHED;
+ purple_whiteboard_set_state(wb, DOODLE_STATE_ESTABLISHED);
purple_whiteboard_start(wb);
}
@@ -372,7 +372,7 @@ void yahoo_doodle_command_got_shutdown(P
/* TODO Ask if user wants to save picture before the session is closed */
- wb->state = DOODLE_STATE_CANCELLED;
+ purple_whiteboard_set_state(wb, DOODLE_STATE_CANCELLED);
purple_whiteboard_destroy(wb);
}
@@ -455,13 +455,14 @@ void yahoo_doodle_end(PurpleWhiteboard *
void yahoo_doodle_end(PurpleWhiteboard *wb)
{
- PurpleConnection *gc = purple_account_get_connection(wb->account);
+ PurpleAccount *account = purple_whiteboard_get_account(wb);
+ PurpleConnection *gc = purple_account_get_connection(account);
doodle_session *ds = purple_whiteboard_get_protocol_data(wb);
/* g_debug_debug("yahoo", "doodle: yahoo_doodle_end()\n"); */
- if (gc && wb->state != DOODLE_STATE_CANCELLED)
- yahoo_doodle_command_send_shutdown(gc, wb->who);
+ if (gc && (purple_whiteboard_get_state(wb) != DOODLE_STATE_CANCELLED))
+ yahoo_doodle_command_send_shutdown(gc, purple_whiteboard_get_who(wb));
g_free(ds->imv_key);
g_free(ds);
@@ -495,20 +496,25 @@ void yahoo_doodle_send_draw_list(PurpleW
void yahoo_doodle_send_draw_list(PurpleWhiteboard *wb, GList *draw_list)
{
+ PurpleAccount *account = purple_whiteboard_get_account(wb);
+ PurpleConnection *gc = purple_account_get_connection(account);
doodle_session *ds = purple_whiteboard_get_protocol_data(wb);
char *message;
g_return_if_fail(draw_list != NULL);
message = yahoo_doodle_build_draw_string(ds, draw_list);
- yahoo_doodle_command_send_draw(wb->account->gc, wb->who, message, ds->imv_key);
+ yahoo_doodle_command_send_draw(gc, purple_whiteboard_get_who(wb), message, ds->imv_key);
g_free(message);
}
void yahoo_doodle_clear(PurpleWhiteboard *wb)
{
+ PurpleAccount *account = purple_whiteboard_get_account(wb);
+ PurpleConnection *gc = purple_account_get_connection(account);
doodle_session *ds = purple_whiteboard_get_protocol_data(wb);
- yahoo_doodle_command_send_clear(wb->account->gc, wb->who, ds->imv_key);
+
+ yahoo_doodle_command_send_clear(gc, purple_whiteboard_get_who(wb), ds->imv_key);
}
============================================================
--- libpurple/protocols/silc/wb.c 5b9e1e27e18efd8415cf37f0908e107bf8bd8069
+++ libpurple/protocols/silc/wb.c 9bd78592996e15156b221e8c886305e782ddd4c7
@@ -375,7 +375,7 @@ void silcpurple_wb_send(PurpleWhiteboard
SilcPurple sg;
g_return_if_fail(draw_list);
- gc = purple_account_get_connection(wb->account);
+ gc = purple_account_get_connection(purple_whiteboard_get_account(wb));
g_return_if_fail(gc);
sg = purple_connection_get_protocol_data(gc);
g_return_if_fail(sg);
@@ -482,7 +482,7 @@ void silcpurple_wb_clear(PurpleWhiteboar
PurpleConnection *gc;
SilcPurple sg;
- gc = purple_account_get_connection(wb->account);
+ gc = purple_account_get_connection(purple_whiteboard_get_account(wb));
g_return_if_fail(gc);
sg = purple_connection_get_protocol_data(gc);
g_return_if_fail(sg);
More information about the Commits
mailing list