--- a/pidgin/gtkblist.c Mon Nov 22 10:18:15 2010 +0000
+++ b/pidgin/gtkblist.c Thu Nov 25 22:30:18 2010 +0000
@@ -244,7 +244,7 @@
/* check for visibility because when we aren't visible, this will *
* give us bogus (0,0) coordinates. - xOr */
- if (GTK_WIDGET_VISIBLE(w))
+ if (gtk_widget_get_visible(w)) gtk_window_get_position(GTK_WINDOW(w), &x, &y);
return FALSE; /* carry on normally */
@@ -990,20 +990,23 @@
gtkblist = PIDGIN_BLIST(purple_get_blist());
blist_window = gtkblist ? GTK_WINDOW(gtkblist->window) : NULL;
+ /* TODO: set no separator in gtk+ 3... */ data->window = gtk_dialog_new_with_buttons(title,
- blist_window, GTK_DIALOG_NO_SEPARATOR,
+ blist_window, 0, NULL); gtk_window_set_transient_for(GTK_WINDOW(data->window), blist_window);
gtk_dialog_set_default_response(GTK_DIALOG(data->window), GTK_RESPONSE_OK);
gtk_container_set_border_width(GTK_CONTAINER(data->window), PIDGIN_HIG_BOX_SPACE);
gtk_window_set_resizable(GTK_WINDOW(data->window), FALSE);
- gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(data->window)->vbox), PIDGIN_HIG_BORDER);
- gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(data->window)->vbox), PIDGIN_HIG_BOX_SPACE);
+ gtk_box_set_spacing(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(data->window))), + gtk_container_set_border_width(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(data->window))), gtk_window_set_role(GTK_WINDOW(data->window), window_role);
hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BORDER);
- gtk_container_add(GTK_CONTAINER(GTK_DIALOG(data->window)->vbox), hbox);
+ gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(data->window))), gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0);
gtk_misc_set_alignment(GTK_MISC(img), 0, 0);
@@ -1066,7 +1069,7 @@
adjust = gtk_adjustment_new(pce->min, pce->min, pce->max,
input = gtk_spin_button_new(GTK_ADJUSTMENT(adjust), 1, 0);
@@ -1627,11 +1630,11 @@
pidgin_retrieve_user_info(buddy->account->gc, buddy->name);
gtk_blist_menu_alias_cb(tv, node);
path = gtk_tree_model_get_path(GTK_TREE_MODEL(gtkblist->treemodel), &iter);
if (gtk_tree_view_row_expanded(GTK_TREE_VIEW(tv), path)) {
@@ -1653,7 +1656,7 @@
gtk_tree_path_free(path);
path = gtk_tree_model_get_path(GTK_TREE_MODEL(gtkblist->treemodel), &iter);
if (!gtk_tree_view_row_expanded(GTK_TREE_VIEW(tv), path)) {
@@ -2276,9 +2279,9 @@
- if (data->target == gdk_atom_intern("PURPLE_BLIST_NODE", FALSE))
+ GdkAtom target = gtk_selection_data_get_target(data); + if (target == gdk_atom_intern("PURPLE_BLIST_NODE", FALSE)) { GtkTreeRowReference *ref = g_object_get_data(G_OBJECT(dc), "gtk-tree-view-source-row");
GtkTreePath *sourcerow = gtk_tree_row_reference_get_path(ref);
@@ -2297,9 +2300,7 @@
gtk_tree_path_free(sourcerow);
- else if (data->target == gdk_atom_intern("application/x-im-contact", FALSE))
+ } else if (target == gdk_atom_intern("application/x-im-contact", FALSE)) { GtkTreeRowReference *ref;
@@ -2382,16 +2383,19 @@
static void pidgin_blist_drag_data_rcv_cb(GtkWidget *widget, GdkDragContext *dc, guint x, guint y,
GtkSelectionData *sd, guint info, guint t)
+ GdkAtom target = gtk_selection_data_get_target(sd); + const guchar *data = gtk_selection_data_get_data(sd); if (gtkblist->drag_timeout) {
g_source_remove(gtkblist->drag_timeout);
gtkblist->drag_timeout = 0;
- if (sd->target == gdk_atom_intern("PURPLE_BLIST_NODE", FALSE) && sd->data) {
+ if (target == gdk_atom_intern("PURPLE_BLIST_NODE", FALSE) && data) { PurpleBlistNode *n = NULL;
GtkTreePath *path = NULL;
GtkTreeViewDropPosition position;
- memcpy(&n, sd->data, sizeof(n));
+ memcpy(&n, data, sizeof(n)); if(gtk_tree_view_get_dest_row_at_pos(GTK_TREE_VIEW(widget), x, y, &path, &position)) {
/* if we're here, I think it means the drop is ok */
@@ -2530,12 +2534,10 @@
gtk_tree_path_free(path);
- gtk_drag_finish(dc, TRUE, (dc->action == GDK_ACTION_MOVE), t);
- else if (sd->target == gdk_atom_intern("application/x-im-contact",
+ gtk_drag_finish(dc, TRUE, (gdk_drag_context_get_actions(dc) == GDK_ACTION_MOVE), t); + } else if (target == gdk_atom_intern("application/x-im-contact", PurpleGroup *group = NULL;
GtkTreePath *path = NULL;
GtkTreeViewDropPosition position;
@@ -2573,7 +2575,7 @@
- if (pidgin_parse_x_im_contact((const char *)sd->data, FALSE, &account,
+ if (pidgin_parse_x_im_contact((const char *) data, FALSE, &account, &protocol, &username, &alias))
@@ -2597,9 +2599,10 @@
gtk_tree_path_free(path);
- gtk_drag_finish(dc, TRUE, (dc->action == GDK_ACTION_MOVE), t);
- else if (sd->target == gdk_atom_intern("text/x-vcard", FALSE) && sd->data)
+ gtk_drag_finish(dc, TRUE, + (gdk_drag_context_get_actions(dc) == GDK_ACTION_MOVE), t); + else if (target == gdk_atom_intern("text/x-vcard", FALSE) && data) PurpleGroup *group = NULL;
@@ -2635,10 +2638,11 @@
- result = parse_vcard((const gchar *)sd->data, group);
- gtk_drag_finish(dc, result, (dc->action == GDK_ACTION_MOVE), t);
- } else if (sd->target == gdk_atom_intern("text/uri-list", FALSE) && sd->data) {
+ result = parse_vcard((const gchar *) data, group); + gtk_drag_finish(dc, result, + (gdk_drag_context_get_actions(dc) == GDK_ACTION_MOVE), t); + } else if (target == gdk_atom_intern("text/uri-list", FALSE) && data) { GtkTreePath *path = NULL;
GtkTreeViewDropPosition position;
@@ -2659,7 +2663,8 @@
if (PURPLE_BLIST_NODE_IS_BUDDY(node) || PURPLE_BLIST_NODE_IS_CONTACT(node)) {
PurpleBuddy *b = PURPLE_BLIST_NODE_IS_BUDDY(node) ? PURPLE_BUDDY(node) : purple_contact_get_priority_buddy(PURPLE_CONTACT(node));
pidgin_dnd_file_manage(sd, b->account, b->name);
- gtk_drag_finish(dc, TRUE, (dc->action == GDK_ACTION_MOVE), t);
+ gtk_drag_finish(dc, TRUE, + (gdk_drag_context_get_actions(dc) == GDK_ACTION_MOVE), t); gtk_drag_finish(dc, FALSE, FALSE, t);
@@ -2997,7 +3002,7 @@
if(gtkblist->tooltipdata == NULL)
- style = gtkblist->tipwindow->style;
+ style = gtk_widget_get_style(gtkblist->tipwindow); @@ -3023,73 +3028,102 @@
for(l = gtkblist->tooltipdata; l; l = l->next)
struct tooltip_data *td = l->data;
+ cairo_t *cr = gdk_cairo_create(GDK_DRAWABLE(gtkblist->tipwindow)); if (td->avatar && pidgin_gdk_pixbuf_is_opaque(td->avatar))
if (dir == GTK_TEXT_DIR_RTL)
- gtk_paint_flat_box(style, gtkblist->tipwindow->window, GTK_STATE_NORMAL, GTK_SHADOW_OUT,
- NULL, gtkblist->tipwindow, "tooltip",
- TOOLTIP_BORDER -1, current_height -1, td->avatar_width +2, td->avatar_height + 2);
+ gtk_paint_flat_box(style, cr, GTK_STATE_NORMAL, GTK_SHADOW_OUT, + gtkblist->tipwindow, "tooltip", + TOOLTIP_BORDER -1, current_height -1, td->avatar_width +2, + td->avatar_height + 2); - gtk_paint_flat_box(style, gtkblist->tipwindow->window, GTK_STATE_NORMAL, GTK_SHADOW_OUT,
- NULL, gtkblist->tipwindow, "tooltip",
+ gtk_paint_flat_box(style, cr, GTK_STATE_NORMAL, GTK_SHADOW_OUT, + gtkblist->tipwindow, "tooltip", max_width - (td->avatar_width+ TOOLTIP_BORDER)-1,
current_height-1,td->avatar_width+2, td->avatar_height+2);
- if (dir == GTK_TEXT_DIR_RTL)
+ if (dir == GTK_TEXT_DIR_RTL) { + gdk_cairo_set_source_pixbuf(cr, td->status_icon, + max_width - TOOLTIP_BORDER - status_size, current_height); gdk_draw_pixbuf(GDK_DRAWABLE(gtkblist->tipwindow->window), NULL, td->status_icon,
0, 0, max_width - TOOLTIP_BORDER - status_size, current_height, -1, -1, GDK_RGB_DITHER_NONE, 0, 0);
+ gdk_cairo_set_source_pixbuf(cr, td->status_icon, TOOLTIP_BORDER, current_height); gdk_draw_pixbuf(GDK_DRAWABLE(gtkblist->tipwindow->window), NULL, td->status_icon,
0, 0, TOOLTIP_BORDER, current_height, -1 , -1, GDK_RGB_DITHER_NONE, 0, 0);
- if (dir == GTK_TEXT_DIR_RTL)
+ if (dir == GTK_TEXT_DIR_RTL) { + gdk_cairo_set_source_pixbuf(cr, td->avatar, TOOLTIP_BORDER, current_height); gdk_draw_pixbuf(GDK_DRAWABLE(gtkblist->tipwindow->window), NULL,
td->avatar, 0, 0, TOOLTIP_BORDER, current_height, -1, -1, GDK_RGB_DITHER_NONE, 0, 0);
+ gdk_cairo_set_source_pixbuf(cr, td->avatar, + max_width - (td->avatar_width + TOOLTIP_BORDER), current_height); gdk_draw_pixbuf(GDK_DRAWABLE(gtkblist->tipwindow->window), NULL,
td->avatar, 0, 0, max_width - (td->avatar_width + TOOLTIP_BORDER),
current_height, -1 , -1, GDK_RGB_DITHER_NONE, 0, 0);
- if (!td->avatar_is_prpl_icon && td->prpl_icon)
+ if (!td->avatar_is_prpl_icon && td->prpl_icon) { + gdk_cairo_set_source_pixbuf(cr, td->prpl_icon, prpl_col, + current_height + ((td->name_height / 2) - (PRPL_SIZE / 2))); gdk_draw_pixbuf(GDK_DRAWABLE(gtkblist->tipwindow->window), NULL, td->prpl_icon,
current_height + ((td->name_height / 2) - (PRPL_SIZE / 2)),
-1 , -1, GDK_RGB_DITHER_NONE, 0, 0);
if (dir == GTK_TEXT_DIR_RTL) {
- gtk_paint_layout(style, gtkblist->tipwindow->window, GTK_STATE_NORMAL, FALSE,
- NULL, gtkblist->tipwindow, "tooltip",
+ gtk_paint_layout(style, cr, GTK_STATE_NORMAL, FALSE, + gtkblist->tipwindow, "tooltip", max_width -(TOOLTIP_BORDER + status_size + SMALL_SPACE) - PANGO_PIXELS(300000),
current_height, td->name_layout);
- gtk_paint_layout (style, gtkblist->tipwindow->window, GTK_STATE_NORMAL, FALSE,
- NULL, gtkblist->tipwindow, "tooltip",
+ gtk_paint_layout (style, cr, GTK_STATE_NORMAL, FALSE, + gtkblist->tipwindow, "tooltip", TOOLTIP_BORDER + status_size + SMALL_SPACE, current_height, td->name_layout);
if (dir != GTK_TEXT_DIR_RTL) {
- gtk_paint_layout (style, gtkblist->tipwindow->window, GTK_STATE_NORMAL, FALSE,
- NULL, gtkblist->tipwindow, "tooltip",
+ gtk_paint_layout (style, cr, GTK_STATE_NORMAL, FALSE, + gtkblist->tipwindow, "tooltip", TOOLTIP_BORDER + status_size + SMALL_SPACE, current_height + td->name_height, td->layout);
- gtk_paint_layout(style, gtkblist->tipwindow->window, GTK_STATE_NORMAL, FALSE,
- NULL, gtkblist->tipwindow, "tooltip",
+ gtk_paint_layout(style, cr, GTK_STATE_NORMAL, FALSE, + gtkblist->tipwindow, "tooltip", max_width - (TOOLTIP_BORDER + status_size + SMALL_SPACE) - PANGO_PIXELS(300000),
current_height + td->name_height,
current_height += MAX(td->name_height + td->height, td->avatar_height) + td->padding;
@@ -3243,7 +3277,8 @@
pidgin_blist_expand_contact_cb(NULL, node);
gtk_tree_view_get_cell_area(GTK_TREE_VIEW(tv), path, NULL, >kblist->contact_rect);
- gdk_drawable_get_size(GDK_DRAWABLE(tv->window), &(gtkblist->contact_rect.width), NULL);
+ gtkblist->contact_rect.width = + gdk_window_get_width(GDK_DRAWABLE(gtk_widget_get_window(tv))); gtkblist->mouseover_contact = node;
gtk_tree_path_down (path);
while (gtk_tree_model_get_iter(GTK_TREE_MODEL(gtkblist->treemodel), &i, path)) {
@@ -4575,7 +4610,7 @@
/* if the window exists, is hidden, we're saving positions, and the
if (gtkblist && gtkblist->window &&
- !GTK_WIDGET_VISIBLE(gtkblist->window) && blist_width != 0) {
+ !gtk_widget_get_visible(gtkblist->window) && blist_width != 0) { blist_x = purple_prefs_get_int(PIDGIN_PREFS_ROOT "/blist/x");
blist_y = purple_prefs_get_int(PIDGIN_PREFS_ROOT "/blist/y");
@@ -4605,7 +4640,7 @@
PurpleBlistNode *gnode, *cnode;
if (gtk_blist_visibility == GDK_VISIBILITY_FULLY_OBSCURED
- || !GTK_WIDGET_VISIBLE(gtkblist->window))
+ || !gtk_widget_get_visible(gtkblist->window)) for(gnode = list->root; gnode; gnode = gnode->next) {
@@ -5117,7 +5152,7 @@
widget = gtk_window_get_focus(GTK_WINDOW(gtkblist->window));
if (GTK_IS_IMHTML(widget) || GTK_IS_ENTRY(widget)) {
- if (gtk_bindings_activate(GTK_OBJECT(widget), event->keyval, event->state))
+ if (gtk_bindings_activate(G_OBJECT(widget), event->keyval, event->state)) @@ -5126,14 +5161,14 @@
headline_box_enter_cb(GtkWidget *widget, GdkEventCrossing *event, PidginBuddyList *gtkblist)
- gdk_window_set_cursor(widget->window, gtkblist->hand_cursor);
+ gdk_window_set_cursor(gtk_widget_get_window(widget), gtkblist->hand_cursor); headline_box_leave_cb(GtkWidget *widget, GdkEventCrossing *event, PidginBuddyList *gtkblist)
- gdk_window_set_cursor(widget->window, gtkblist->arrow_cursor);
+ gdk_window_set_cursor(gtk_widget_get_window(widget), gtkblist->arrow_cursor); @@ -5267,7 +5302,7 @@
-generic_error_destroy_cb(GtkObject *dialog,
+generic_error_destroy_cb(GtkWidget *dialog, g_hash_table_remove(gtkblist->connection_errors, account);
@@ -5629,17 +5664,22 @@
- gtk_paint_flat_box (widget->style,
+ cairo_t *cr = gdk_cairo_create(GDK_DRAWABLE(widget)); + GtkAllocation allocation; + gtk_widget_get_allocation(widget, &allocation); + gtk_paint_flat_box (gtk_widget_get_style(widget),
- widget->allocation.x + 1,
- widget->allocation.y + 1,
- widget->allocation.width - 2,
- widget->allocation.height - 2);
+ allocation.height - 2); @@ -5979,7 +6019,9 @@
G_CALLBACK(blist_focus_cb), gtkblist);
g_signal_connect(G_OBJECT(gtkblist->window), "focus-out-event",
G_CALLBACK(blist_focus_cb), gtkblist);
- GTK_WINDOW(gtkblist->window)->allow_shrink = TRUE;
+ /* TODO: how is this done in gtk+ 3.0? */ + /*GTK_WINDOW(gtkblist->window)->allow_shrink = TRUE;*/ gtkblist->main_vbox = gtk_vbox_new(FALSE, 0);
gtk_widget_show(gtkblist->main_vbox);
@@ -7138,7 +7180,8 @@
- if(!PIDGIN_WINDOW_ICONIFIED(gtkblist->window) && !GTK_WIDGET_VISIBLE(gtkblist->window))
+ if(!PIDGIN_WINDOW_ICONIFIED(gtkblist->window) && + !gtk_widget_get_visible(gtkblist->window)) purple_signal_emit(pidgin_blist_get_handle(), "gtkblist-unhiding", gtkblist);
pidgin_blist_restore_position();
gtk_window_present(GTK_WINDOW(gtkblist->window));
@@ -7147,7 +7190,7 @@
purple_signal_emit(pidgin_blist_get_handle(), "gtkblist-hiding", gtkblist);
gtk_widget_hide(gtkblist->window);
- if (!GTK_WIDGET_VISIBLE(gtkblist->window))
+ if (!gtk_widget_get_visible(gtkblist->window)) gtk_widget_show(gtkblist->window);
gtk_window_iconify(GTK_WINDOW(gtkblist->window));
@@ -7523,7 +7566,7 @@
pidgin_blist_toggle_visibility()
if (gtkblist && gtkblist->window) {
- if (GTK_WIDGET_VISIBLE(gtkblist->window)) {
+ if (gtk_widget_get_visible(gtkblist->window)) { /* make the buddy list visible if it is iconified or if it is
* obscured and not currently focused (the focus part ensures
* that we do something reasonable if the buddy list is obscured
@@ -7588,7 +7631,7 @@
- if (gtkblist->window && !GTK_WIDGET_HAS_FOCUS(gtkblist->window))
+ if (gtkblist->window && !gtk_widget_is_focus(gtkblist->window)) pidgin_set_urgent(GTK_WINDOW(gtkblist->window), TRUE);
@@ -8131,7 +8174,7 @@
-plugin_act(GtkObject *obj, PurplePluginAction *pam)
+plugin_act(GtkWidget *obj, PurplePluginAction *pam) if (pam && pam->callback)
--- a/pidgin/gtkconv.c Mon Nov 22 10:18:15 2010 +0000
+++ b/pidgin/gtkconv.c Thu Nov 25 22:30:18 2010 +0000
@@ -778,15 +778,17 @@
InviteBuddyInfo *info = (InviteBuddyInfo *)data;
const char *convprotocol;
+ GdkAtom target = gtk_selection_data_get_target(sd); convprotocol = purple_account_get_protocol_id(purple_conversation_get_account(info->conv));
- if (sd->target == gdk_atom_intern("PURPLE_BLIST_NODE", FALSE))
+ if (target == gdk_atom_intern("PURPLE_BLIST_NODE", FALSE)) PurpleBlistNode *node = NULL;
- memcpy(&node, sd->data, sizeof(node));
+ const guchar *data = gtk_selection_data_get_data(sd); + memcpy(&node, data, sizeof(node)); if (PURPLE_BLIST_NODE_IS_CONTACT(node))
buddy = purple_contact_get_priority_buddy((PurpleContact *)node);
@@ -805,15 +807,16 @@
gtk_entry_set_text(GTK_ENTRY(info->entry), purple_buddy_get_name(buddy));
- gtk_drag_finish(dc, success, (dc->action == GDK_ACTION_MOVE), t);
- else if (sd->target == gdk_atom_intern("application/x-im-contact", FALSE))
+ gtk_drag_finish(dc, success, + gdk_drag_context_get_actions(dc) == GDK_ACTION_MOVE, t); + else if (target == gdk_atom_intern("application/x-im-contact", FALSE)) - if (pidgin_parse_x_im_contact((const char *)sd->data, FALSE, &account,
+ if (pidgin_parse_x_im_contact((const char *) data, FALSE, &account, &protocol, &username, NULL))
@@ -838,7 +841,8 @@
- gtk_drag_finish(dc, success, (dc->action == GDK_ACTION_MOVE), t);
+ gtk_drag_finish(dc, success, + gdk_drag_context_get_actions(dc) == GDK_ACTION_MOVE, t); @@ -880,12 +884,15 @@
gtk_container_set_border_width(GTK_CONTAINER(invite_dialog), PIDGIN_HIG_BOX_SPACE);
gtk_window_set_resizable(GTK_WINDOW(invite_dialog), FALSE);
+ /* TODO: set no separator using GTK+ 3.0 */ gtk_dialog_set_has_separator(GTK_DIALOG(invite_dialog), FALSE);
info->window = GTK_WIDGET(invite_dialog);
/* Setup the outside spacing. */
- vbox = GTK_DIALOG(invite_dialog)->vbox;
+ vbox = gtk_dialog_get_content_area(GTK_DIALOG(invite_dialog)); gtk_box_set_spacing(GTK_BOX(vbox), PIDGIN_HIG_BORDER);
gtk_container_set_border_width(GTK_CONTAINER(vbox), PIDGIN_HIG_BOX_SPACE);
@@ -1078,8 +1085,8 @@
gtkblist = pidgin_blist_get_default_gtk_blist();
cursor = gdk_cursor_new(GDK_WATCH);
- gdk_window_set_cursor(gtkblist->window->window, cursor);
- gdk_window_set_cursor(win->window->window, cursor);
+ gdk_window_set_cursor(gtk_widget_get_window(gtkblist->window), cursor); + gdk_window_set_cursor(gtk_widget_get_window(win->window), cursor); gdk_cursor_unref(cursor);
#if GTK_CHECK_VERSION(2,4,0) && !GTK_CHECK_VERSION(2,6,0) //FIXME: What?
gdk_display_flush(gdk_drawable_get_display(GDK_DRAWABLE(widget->window)));
@@ -1096,8 +1103,8 @@
pidgin_log_show_contact((PurpleContact *)node->parent);
- gdk_window_set_cursor(gtkblist->window->window, NULL);
- gdk_window_set_cursor(win->window->window, NULL);
+ gdk_window_set_cursor(gtk_widget_get_window(gtkblist->window), NULL); + gdk_window_set_cursor(gtk_widget_get_window(win->window), NULL); @@ -1105,8 +1112,8 @@
pidgin_log_show(type, name, account);
- gdk_window_set_cursor(gtkblist->window->window, NULL);
- gdk_window_set_cursor(win->window->window, NULL);
+ gdk_window_set_cursor(gtk_widget_get_window(gtkblist->window), NULL); + gdk_window_set_cursor(gtk_widget_get_window(win->window), NULL); @@ -1919,7 +1926,7 @@
/* If CTRL was held down... */
if (event->state & GDK_CONTROL_MASK) {
+ case GDK_KEY_Page_Down: if (!pidgin_conv_window_get_gtkconv_at_index(win, curconv + 1))
gtk_notebook_set_current_page(GTK_NOTEBOOK(win->notebook), 0);
@@ -1928,7 +1935,7 @@
if (!pidgin_conv_window_get_gtkconv_at_index(win, curconv - 1))
gtk_notebook_set_current_page(GTK_NOTEBOOK(win->notebook), -1);
@@ -1937,9 +1944,9 @@
+ case GDK_KEY_ISO_Left_Tab: if (event->state & GDK_SHIFT_MASK) {
move_to_next_unread_tab(gtkconv, FALSE);
@@ -1949,20 +1956,20 @@
gtk_notebook_reorder_child(GTK_NOTEBOOK(win->notebook),
gtk_notebook_get_nth_page(GTK_NOTEBOOK(win->notebook), curconv),
gtk_notebook_reorder_child(GTK_NOTEBOOK(win->notebook),
gtk_notebook_get_nth_page(GTK_NOTEBOOK(win->notebook), curconv),
(curconv + 1) % gtk_notebook_get_n_pages(GTK_NOTEBOOK(win->notebook)));
if (gtkconv_cycle_focus(gtkconv, event->state & GDK_SHIFT_MASK ? GTK_DIR_TAB_BACKWARD : GTK_DIR_TAB_FORWARD))
@@ -1986,13 +1993,13 @@
if (gtk_widget_is_focus(GTK_WIDGET(win->notebook))) {
infopane_entry_activate(gtkconv);
if (gtkconv_cycle_focus(gtkconv, event->state & GDK_SHIFT_MASK ? GTK_DIR_TAB_BACKWARD : GTK_DIR_TAB_FORWARD))
@@ -2016,7 +2023,7 @@
/* If CTRL was held down... */
if (event->state & GDK_CONTROL_MASK) {
if (!gtkconv->send_history)
@@ -2067,7 +2074,7 @@
if (!gtkconv->send_history)
@@ -2120,20 +2127,20 @@
/* If neither CTRL nor ALT were held down... */
+ case GDK_KEY_ISO_Left_Tab: if (gtkconv->entry != entry)
return tab_complete(conv);
gtk_imhtml_page_up(GTK_IMHTML(gtkconv->imhtml));
+ case GDK_KEY_Page_Down: gtk_imhtml_page_down(GTK_IMHTML(gtkconv->imhtml));
@@ -2177,24 +2184,24 @@
/* If we have a valid key for the conversation display, then exit */
if ((event->state & GDK_CONTROL_MASK) ||
- (event->keyval == GDK_F6) ||
- (event->keyval == GDK_F10) ||
- (event->keyval == GDK_Shift_L) ||
- (event->keyval == GDK_Shift_R) ||
- (event->keyval == GDK_Control_L) ||
- (event->keyval == GDK_Control_R) ||
- (event->keyval == GDK_Escape) ||
- (event->keyval == GDK_Up) ||
- (event->keyval == GDK_Down) ||
- (event->keyval == GDK_Left) ||
- (event->keyval == GDK_Right) ||
- (event->keyval == GDK_Page_Up) ||
- (event->keyval == GDK_Page_Down) ||
- (event->keyval == GDK_Home) ||
- (event->keyval == GDK_End) ||
- (event->keyval == GDK_Tab) ||
- (event->keyval == GDK_KP_Tab) ||
- (event->keyval == GDK_ISO_Left_Tab))
+ (event->keyval == GDK_KEY_F6) || + (event->keyval == GDK_KEY_F10) || + (event->keyval == GDK_KEY_Shift_L) || + (event->keyval == GDK_KEY_Shift_R) || + (event->keyval == GDK_KEY_Control_L) || + (event->keyval == GDK_KEY_Control_R) || + (event->keyval == GDK_KEY_Escape) || + (event->keyval == GDK_KEY_Up) || + (event->keyval == GDK_KEY_Down) || + (event->keyval == GDK_KEY_Left) || + (event->keyval == GDK_KEY_Right) || + (event->keyval == GDK_KEY_Page_Up) || + (event->keyval == GDK_KEY_Page_Down) || + (event->keyval == GDK_KEY_Home) || + (event->keyval == GDK_KEY_End) || + (event->keyval == GDK_KEY_Tab) || + (event->keyval == GDK_KEY_KP_Tab) || + (event->keyval == GDK_KEY_ISO_Left_Tab)) if (event->type == GDK_KEY_PRESS)
return conv_keypress_common(gtkconv, event);
@@ -2662,7 +2669,7 @@
-start_anim(GtkObject *obj, PidginConversation *gtkconv)
+start_anim(GtkWidget *widget, PidginConversation *gtkconv) @@ -2835,7 +2842,7 @@
-stop_anim(GtkObject *obj, PidginConversation *gtkconv)
+stop_anim(GtkWidget *widget, PidginConversation *gtkconv) if (gtkconv->u.im->icon_timer != 0)
g_source_remove(gtkconv->u.im->icon_timer);
@@ -2857,7 +2864,7 @@
-icon_menu(GtkObject *obj, GdkEventButton *e, PidginConversation *gtkconv)
+icon_menu(GtkWidget *widget, GdkEventButton *e, PidginConversation *gtkconv) static GtkWidget *menu = NULL;
PurpleConversation *conv;
@@ -4658,13 +4665,22 @@
int pad_top, pad_inside, pad_bottom;
- int total_height = (gtkconv->imhtml->allocation.height + gtkconv->entry->allocation.height);
- int max_height = total_height / 2;
int min_lines = purple_prefs_get_int(PIDGIN_PREFS_ROOT "/conversations/minimum_entry_lines");
+ GtkAllocation imhtml_allocation; + GtkAllocation entry_allocation; + GtkAllocation lower_hbox_allocation; + gtk_widget_get_allocation(gtkconv->imhtml, &imhtml_allocation); + gtk_widget_get_allocation(gtkconv->entry, &entry_allocation); + gtk_widget_get_allocation(gtkconv->lower_hbox, &lower_hbox_allocation); + total_height = imhtml_allocation.height + entry_allocation.height; + max_height = total_height / 2; pad_top = gtk_text_view_get_pixels_above_lines(GTK_TEXT_VIEW(gtkconv->entry));
pad_bottom = gtk_text_view_get_pixels_below_lines(GTK_TEXT_VIEW(gtkconv->entry));
pad_inside = gtk_text_view_get_pixels_inside_wrap(GTK_TEXT_VIEW(gtkconv->entry));
@@ -4697,12 +4713,12 @@
height += 2 * focus_width;
- diff = height - gtkconv->entry->allocation.height;
+ diff = height - entry_allocation.height; if (ABS(diff) < oneline.height / 2)
gtk_widget_set_size_request(gtkconv->lower_hbox, -1,
- diff + gtkconv->lower_hbox->allocation.height);
+ diff + lower_hbox_allocation.height); @@ -4749,7 +4765,7 @@
if(prpl_info->set_chat_topic == NULL) {
gtk_editable_set_editable(GTK_EDITABLE(gtkchat->topic_text), FALSE);
- g_signal_connect(GTK_OBJECT(gtkchat->topic_text), "activate",
+ g_signal_connect(GTK_WIDGET(gtkchat->topic_text), "activate", G_CALLBACK(topic_callback), gtkconv);
@@ -4924,7 +4940,7 @@
gtk_widget_modify_base(gtkconv->quickfind.entry, GTK_STATE_NORMAL, NULL);
gtk_imhtml_search_clear(GTK_IMHTML(gtkconv->imhtml));
- gtk_widget_hide_all(gtkconv->quickfind.container);
+ gtk_widget_hide(gtkconv->quickfind.container); gtk_widget_grab_focus(gtkconv->entry);
@@ -4934,8 +4950,8 @@
quickfind_process_input(GtkWidget *entry, GdkEventKey *event, PidginConversation *gtkconv)
if (gtk_imhtml_search_find(GTK_IMHTML(gtkconv->imhtml), gtk_entry_get_text(GTK_ENTRY(entry)))) {
gtk_widget_modify_base(gtkconv->quickfind.entry, GTK_STATE_NORMAL, NULL);
@@ -4946,7 +4962,7 @@
gtk_widget_modify_base(gtkconv->quickfind.entry, GTK_STATE_NORMAL, &col);
pidgin_conv_end_quickfind(gtkconv);
@@ -5189,8 +5205,10 @@
PurpleAccount *convaccount = purple_conversation_get_account(conv);
PurpleConnection *gc = purple_account_get_connection(convaccount);
PurplePluginProtocolInfo *prpl_info = gc ? PURPLE_PLUGIN_PROTOCOL_INFO(gc->prpl) : NULL;
- if (sd->target == gdk_atom_intern("PURPLE_BLIST_NODE", FALSE))
+ GdkAtom target = gtk_selection_data_get_target(sd); + const guchar *data = gtk_selection_data_get_data(sd); + if (target == gdk_atom_intern("PURPLE_BLIST_NODE", FALSE)) PurpleBlistNode *n = NULL;
@@ -5198,7 +5216,7 @@
PurpleAccount *buddyaccount;
- n = *(PurpleBlistNode **)sd->data;
+ n = *(PurpleBlistNode **) data; if (PURPLE_BLIST_NODE_IS_CONTACT(n))
b = purple_contact_get_priority_buddy((PurpleContact*)n);
@@ -5246,16 +5264,17 @@
pidgin_conv_window_switch_gtkconv(win, gtkconv);
- gtk_drag_finish(dc, TRUE, (dc->action == GDK_ACTION_MOVE), t);
- else if (sd->target == gdk_atom_intern("application/x-im-contact", FALSE))
+ gtk_drag_finish(dc, TRUE, + gdk_drag_context_get_actions(dc) == GDK_ACTION_MOVE, t); + else if (target == gdk_atom_intern("application/x-im-contact", FALSE)) PidginConversation *gtkconv;
- if (pidgin_parse_x_im_contact((const char *)sd->data, FALSE, &account,
+ if (pidgin_parse_x_im_contact((const char *) data, FALSE, &account, &protocol, &username, NULL))
@@ -5286,12 +5305,14 @@
- gtk_drag_finish(dc, TRUE, (dc->action == GDK_ACTION_MOVE), t);
- else if (sd->target == gdk_atom_intern("text/uri-list", FALSE)) {
+ gtk_drag_finish(dc, TRUE, + gdk_drag_context_get_actions(dc) == GDK_ACTION_MOVE, t); + else if (target == gdk_atom_intern("text/uri-list", FALSE)) { if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM)
pidgin_dnd_file_manage(sd, convaccount, purple_conversation_get_name(conv));
- gtk_drag_finish(dc, TRUE, (dc->action == GDK_ACTION_MOVE), t);
+ gtk_drag_finish(dc, TRUE, + gdk_drag_context_get_actions(dc) == GDK_ACTION_MOVE, t); gtk_drag_finish(dc, FALSE, FALSE, t);
@@ -5697,21 +5718,28 @@
GdkEventButton *btn_event = (GdkEventButton*) event;
PurpleConversation *conv = data;
+ g_object_get(G_OBJECT(tag), "name", &name, NULL); /* strlen("BUDDY " or "HILIT ") == 6 */
- g_return_val_if_fail((tag->name != NULL)
- && (strlen(tag->name) > 6), FALSE);
- buddyname = (tag->name) + 6;
+ g_return_val_if_fail((name != NULL) && (strlen(name) > 6), FALSE); if (btn_event->button == 1 &&
event->type == GDK_2BUTTON_PRESS) {
chat_do_im(PIDGIN_CONVERSATION(conv), buddyname);
} else if (btn_event->button == 2
&& event->type == GDK_2BUTTON_PRESS) {
chat_do_info(PIDGIN_CONVERSATION(conv), buddyname);
} else if (btn_event->button == 3
&& event->type == GDK_BUTTON_PRESS) {
@@ -5733,10 +5761,14 @@
/* Don't propagate the event any further */
@@ -6863,7 +6895,7 @@
- if (!GTK_WIDGET_REALIZED(gtkconv->tab_label))
+ if (!gtk_widget_get_realized(gtkconv->tab_label)) gtk_widget_realize(gtkconv->tab_label);
accessibility_obj = gtk_widget_get_accessible(gtkconv->tab_cont);
@@ -7238,11 +7270,14 @@
gint pane_x, pane_y, x_rel;
PidginConversation *gtkconv;
- gdk_window_get_origin(win->notebook->window, &pane_x, &pane_y);
+ GtkAllocation allocation; + gtk_widget_get_allocation(gtkconv->infopane, &allocation); + gdk_window_get_origin(gtk_widget_get_window(win->notebook), gtkconv = pidgin_conv_window_get_active_gtkconv(win);
- return (x_rel > gtkconv->infopane->allocation.x + gtkconv->infopane->allocation.width / 2);
+ return (x_rel > allocation.x + allocation.width / 2); @@ -7260,7 +7295,7 @@
notebook = GTK_NOTEBOOK(win->notebook);
- gdk_window_get_origin(win->notebook->window, &nb_x, &nb_y);
+ gdk_window_get_origin(gtk_widget_get_window(win->notebook), &nb_x, &nb_y); @@ -7270,30 +7305,32 @@
count = gtk_notebook_get_n_pages(GTK_NOTEBOOK(notebook));
for (i = 0; i < count; i++) {
+ GtkAllocation allocation; + gtk_widget_get_allocation(tab, &allocation); page = gtk_notebook_get_nth_page(GTK_NOTEBOOK(notebook), i);
tab = gtk_notebook_get_tab_label(GTK_NOTEBOOK(notebook), page);
/* Make sure the tab is not hidden beyond an arrow */
- if (!GTK_WIDGET_DRAWABLE(tab) && gtk_notebook_get_show_tabs(notebook))
+ if (!gtk_widget_is_drawable(tab) && gtk_notebook_get_show_tabs(notebook)) - if (x_rel >= tab->allocation.x - PIDGIN_HIG_BOX_SPACE &&
- x_rel <= tab->allocation.x + tab->allocation.width + PIDGIN_HIG_BOX_SPACE) {
+ if (x_rel >= allocation.x - PIDGIN_HIG_BOX_SPACE && + x_rel <= allocation.x + allocation.width + PIDGIN_HIG_BOX_SPACE) { - if (to_right && x_rel >= tab->allocation.x + tab->allocation.width/2)
+ if (to_right && x_rel >= allocation.x + allocation.width/2) - if (y_rel >= tab->allocation.y - PIDGIN_HIG_BOX_SPACE &&
- y_rel <= tab->allocation.y + tab->allocation.height + PIDGIN_HIG_BOX_SPACE) {
+ if (y_rel >= allocation.y - PIDGIN_HIG_BOX_SPACE && + y_rel <= allocation.y + allocation.height + PIDGIN_HIG_BOX_SPACE) { - if (to_right && y_rel >= tab->allocation.y + tab->allocation.height/2)
+ if (to_right && y_rel >= allocation.y + allocation.height/2) @@ -8383,11 +8420,15 @@
gtk_container_set_border_width(GTK_CONTAINER(warn_close_dialog),
gtk_window_set_resizable(GTK_WINDOW(warn_close_dialog), FALSE);
- gtk_dialog_set_has_separator(GTK_DIALOG(warn_close_dialog),
+ /* TODO: figure out how to set no separator in GTK+ 3.0 */ + gtk_dialog_set_has_separator(GTK_DIALOG(warn_close_dialog),
/* Setup the outside spacing. */
- vbox = GTK_DIALOG(warn_close_dialog)->vbox;
+ vbox = gtk_dialog_get_content_area(GTK_DIALOG(warn_close_dialog)); gtk_box_set_spacing(GTK_BOX(vbox), 12);
gtk_container_set_border_width(GTK_CONTAINER(vbox), 6);
@@ -8541,7 +8582,7 @@
always be true after a button press. */
if (!gdk_pointer_is_grabbed())
- gdk_pointer_grab(gtkwin->notebook->window, FALSE,
+ gdk_pointer_grab(gtk_widget_get_window(gtkwin->notebook), FALSE, GDK_BUTTON1_MOTION_MASK | GDK_BUTTON_RELEASE_MASK,
NULL, cursor, GDK_CURRENT_TIME);
@@ -8661,19 +8702,22 @@
+ GtkAllocation allocation; + gtk_widget_get_allocation(gtkconv->infopane_hbox, &allocation); if (gtkconv->win->in_drag)
gtkconv->win->in_predrag = TRUE;
gtkconv->win->drag_tab = gtk_notebook_page_num(GTK_NOTEBOOK(gtkconv->win->notebook), gtkconv->tab_cont);
- gdk_window_get_origin(gtkconv->infopane_hbox->window, &nb_x, &nb_y);
- gtkconv->win->drag_min_x = gtkconv->infopane_hbox->allocation.x + nb_x;
- gtkconv->win->drag_min_y = gtkconv->infopane_hbox->allocation.y + nb_y;
- gtkconv->win->drag_max_x = gtkconv->infopane_hbox->allocation.width + gtkconv->win->drag_min_x;
- gtkconv->win->drag_max_y = gtkconv->infopane_hbox->allocation.height + gtkconv->win->drag_min_y;
+ gdk_window_get_origin(gtk_widget_get_window(gtkconv->infopane_hbox), &nb_x, &nb_y); + gtkconv->win->drag_min_x = allocation.x + nb_x; + gtkconv->win->drag_min_y = allocation.y + nb_y; + gtkconv->win->drag_max_x = allocation.width + gtkconv->win->drag_min_x; + gtkconv->win->drag_max_y = allocation.height + gtkconv->win->drag_min_y; gtkconv->win->drag_motion_signal = g_signal_connect(G_OBJECT(gtkconv->win->notebook), "motion_notify_event",
G_CALLBACK(notebook_motion_cb), gtkconv->win);
@@ -8716,6 +8760,7 @@
+ GtkAllocation allocation; if (e->button == 2 && e->type == GDK_BUTTON_PRESS) {
PidginConversation *gtkconv;
@@ -8753,7 +8798,7 @@
* Get the relative position of the press event, with regards to
* the position of the notebook.
- gdk_window_get_origin(win->notebook->window, &nb_x, &nb_y);
+ gdk_window_get_origin(gtk_widget_get_window(win->notebook), &nb_x, &nb_y); /* Reset the min/max x/y */
@@ -8765,10 +8810,12 @@
page = gtk_notebook_get_nth_page(GTK_NOTEBOOK(win->notebook), tab_clicked);
tab = gtk_notebook_get_tab_label(GTK_NOTEBOOK(win->notebook), page);
- win->drag_min_x = tab->allocation.x + nb_x;
- win->drag_min_y = tab->allocation.y + nb_y;
- win->drag_max_x = tab->allocation.width + win->drag_min_x;
- win->drag_max_y = tab->allocation.height + win->drag_min_y;
+ gtk_widget_get_allocation(tab, &allocation); + win->drag_min_x = allocation.x + nb_x; + win->drag_min_y = allocation.y + nb_y; + win->drag_max_x = allocation.width + win->drag_min_x; + win->drag_max_y = allocation.height + win->drag_min_y; /* Make sure the click occurred in the tab. */
if (e->x_root < win->drag_min_x ||
@@ -9005,12 +9052,15 @@
close_conv_cb(NULL, gtkconv);
+/* TODO: I don't know if this doable in GTK+ 3.0 */ right_click_menu_cb(GtkNotebook *notebook, GdkEventButton *event, PidginWindow *win)
- GtkWidget *item, *menu;
PidginConversation *gtkconv;
+ GtkWidget *menu = gtk_notebook_get_menu if (event->type != GDK_BUTTON_PRESS || event->button != 3)
@@ -9056,6 +9106,7 @@
remove_edit_entry(PidginConversation *gtkconv, GtkWidget *entry)
@@ -9077,7 +9128,7 @@
alias_key_press_cb(GtkWidget *widget, GdkEventKey *event, gpointer user_data)
- if (event->keyval == GDK_Escape) {
+ if (event->keyval == GDK_KEY_Escape) { remove_edit_entry(user_data, widget);
@@ -9122,7 +9173,7 @@
PurpleConversation *conv = gtkconv->active_conv;
- if (!GTK_WIDGET_VISIBLE(gtkconv->infopane)) {
+ if (!gtk_widget_get_visible(gtkconv->infopane)) { /* There's already an entry for alias. Let's not create another one. */
@@ -9284,14 +9335,14 @@
static gboolean gtk_conv_configure_cb(GtkWidget *w, GdkEventConfigure *event, gpointer data) {
- if (GTK_WIDGET_VISIBLE(w))
+ if (gtk_widget_get_visible(w)) gtk_window_get_position(GTK_WINDOW(w), &x, &y);
return FALSE; /* carry on normally */
/* Workaround for GTK+ bug # 169811 - "configure_event" is fired
* when the window is being maximized */
- if (gdk_window_get_state(w->window) & GDK_WINDOW_STATE_MAXIMIZED)
+ if (gdk_window_get_state(gtk_widget_get_window(w)) & GDK_WINDOW_STATE_MAXIMIZED) /* don't save off-screen positioning */
@@ -9319,7 +9370,7 @@
/* if the window exists, is hidden, we're saving positions, and the
if (win && win->window &&
- !GTK_WIDGET_VISIBLE(win->window) && conv_width != 0) {
+ !gtk_widget_get_visible(win->window) && conv_width != 0) { #ifdef _WIN32 /* only override window manager placement on Windows */
/* ...check position is on screen... */
@@ -9404,9 +9455,13 @@
gtk_notebook_set_show_tabs(GTK_NOTEBOOK(win->notebook), FALSE);
gtk_notebook_set_show_border(GTK_NOTEBOOK(win->notebook), TRUE);
+ /* TODO: figure out how to add custom stuff to the right-click menu in + GtkNotebook in GTK+ 3.0 */ g_signal_connect(G_OBJECT(win->notebook), "button-press-event",
G_CALLBACK(right_click_menu_cb), win);
gtk_widget_show(win->notebook);
g_signal_connect(G_OBJECT(win->notebook), "switch_page",
@@ -9497,7 +9552,7 @@
pidgin_conv_window_raise(PidginWindow *win)
- gdk_window_raise(GDK_WINDOW(win->window->window));
+ gdk_window_raise(GDK_WINDOW(gtk_widget_get_window(win->window))); @@ -9672,7 +9727,7 @@
g_signal_connect(G_OBJECT(ebox), "enter-notify-event",
G_CALLBACK(gtkconv_tab_set_tip), gtkconv);
- if (gtkconv->tab_label->parent == NULL) {
+ if (gtk_widget_get_parent(gtkconv->tab_label) == NULL) { /* Pack if it's a new widget */
gtk_box_pack_start(GTK_BOX(gtkconv->tabby), first, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(gtkconv->tabby), gtkconv->tab_label, TRUE, TRUE, 0);
@@ -9693,9 +9748,8 @@
gtk_notebook_set_tab_label(GTK_NOTEBOOK(win->notebook), gtkconv->tab_cont, ebox);
- gtk_notebook_set_tab_label_packing(GTK_NOTEBOOK(win->notebook), gtkconv->tab_cont,
+ g_object_set(G_OBJECT(win->notebook), "expand", !tabs_side && !angle, if (pidgin_conv_window_get_gtkconv_count(win) == 1)
gtk_notebook_set_show_tabs(GTK_NOTEBOOK(win->notebook),
@@ -9807,7 +9861,7 @@
for (l = pidgin_conv_windows_get_list(); l != NULL; l = l->next) {
- if (gdkwin == win->window->window)
+ if (gdkwin == gtk_widget_get_window(win->window)) @@ -9929,14 +9983,14 @@
PurpleConversationType type = purple_conversation_get_type(conv->active_conv);
- if (GTK_WIDGET_VISIBLE(w))
+ if (gtk_widget_get_visible(w)) gtk_window_get_position(GTK_WINDOW(w), &x, &y);
return FALSE; /* carry on normally */
/* Workaround for GTK+ bug # 169811 - "configure_event" is fired
* when the window is being maximized */
- if (gdk_window_get_state(w->window) & GDK_WINDOW_STATE_MAXIMIZED)
+ if (gdk_window_get_state(gtk_widget_get_window(w)) & GDK_WINDOW_STATE_MAXIMIZED) /* don't save off-screen positioning */
--- a/pidgin/gtkimhtml.c Mon Nov 22 10:18:15 2010 +0000
+++ b/pidgin/gtkimhtml.c Thu Nov 25 22:30:18 2010 +0000
@@ -410,7 +410,7 @@
/* Don't scroll here if we're in the middle of a smooth scroll */
if (scroll && imhtml->scroll_time == NULL &&
- GTK_WIDGET_REALIZED(imhtml))
+ gtk_widget_get_realized(GTK_WIDGET(imhtml))) gtk_imhtml_scroll_to_end(imhtml, FALSE);
@@ -499,18 +499,22 @@
gtk_imhtml_tip_paint (GtkIMHtml *imhtml)
+ cairo_t *cr = gdk_cairo_create(GDK_DRAWABLE(imhtml->tip_window)); g_return_val_if_fail(GTK_IS_IMHTML(imhtml), FALSE);
layout = gtk_widget_create_pango_layout(imhtml->tip_window, imhtml->tip);
- gtk_paint_flat_box (imhtml->tip_window->style, imhtml->tip_window->window,
- GTK_STATE_NORMAL, GTK_SHADOW_OUT, NULL, imhtml->tip_window,
+ gtk_paint_flat_box (gtk_widget_get_style(imhtml->tip_window), + GTK_STATE_NORMAL, GTK_SHADOW_OUT, imhtml->tip_window, "tooltip", 0, 0, -1, -1);
- gtk_paint_layout (imhtml->tip_window->style, imhtml->tip_window->window, GTK_STATE_NORMAL,
- FALSE, NULL, imhtml->tip_window, NULL, 4, 4, layout);
+ gtk_paint_layout (gtk_widget_get_style(imhtml->tip_window), + GTK_STATE_NORMAL, TRUE, imhtml->tip_window, NULL, 4, 4, layout); @@ -522,12 +526,15 @@
PangoFontMetrics *font_metrics;
+ GtkStyle *style = gtk_widget_get_style(imhtml->tip_window); + GtkAllocation allocation; gint gap, x, y, h, w, scr_w, baseline_skip;
g_return_val_if_fail(GTK_IS_IMHTML(imhtml), FALSE);
- if (!imhtml->tip || !GTK_WIDGET_DRAWABLE (GTK_WIDGET(imhtml))) {
+ gtk_widget_get_allocation(GTK_WIDGET(imhtml), &allocation); + if (!imhtml->tip || !gtk_widget_is_drawable(GTK_WIDGET(imhtml))) { @@ -551,11 +558,10 @@
gtk_widget_ensure_style (imhtml->tip_window);
layout = gtk_widget_create_pango_layout(imhtml->tip_window, imhtml->tip);
font = pango_context_load_font(pango_layout_get_context(layout),
- imhtml->tip_window->style->font_desc);
- char *tmp = pango_font_description_to_string(
- imhtml->tip_window->style->font_desc);
+ char *tmp = pango_font_description_to_string(style->font_desc); purple_debug(PURPLE_DEBUG_ERROR, "gtk_imhtml_tip",
"pango_context_load_font() couldn't load font: '%s'\n",
@@ -580,8 +586,8 @@
gdk_window_get_pointer (NULL, &x, &y, NULL);
- if (GTK_WIDGET_NO_WINDOW (GTK_WIDGET(imhtml)))
- y += GTK_WIDGET(imhtml)->allocation.y;
+ if ((!gtk_widget_get_has_window(GTK_WIDGET(imhtml)))) scr_w = gdk_screen_width();
@@ -621,7 +627,7 @@
oldprelit_tag = GTK_IMHTML(imhtml)->prelit_tag;
- gdk_window_get_pointer(GTK_WIDGET(imhtml)->window, NULL, NULL, NULL);
+ gdk_window_get_pointer(gtk_widget_get_window(GTK_WIDGET(imhtml)), NULL, NULL, NULL); gtk_text_view_window_to_buffer_coords(GTK_TEXT_VIEW(imhtml), GTK_TEXT_WINDOW_WIDGET,
event->x, event->y, &x, &y);
gtk_text_view_get_iter_at_location(GTK_TEXT_VIEW(imhtml), &iter, x, y);
@@ -749,6 +755,8 @@
+/* TODO: I think this can be removed for GTK+ 3.0... */ gtk_imhtml_expose_event (GtkWidget *widget,
@@ -776,7 +784,8 @@
gdk_color_parse(GTK_IMHTML(widget)->edit.background, &gcolor);
gdk_cairo_set_source_color(cr, &gcolor);
- gdk_cairo_set_source_color(cr, &(widget->style->base[GTK_WIDGET_STATE(widget)]));
+ gdk_cairo_set_source_color(cr, + &(gtk_widget_get_style(widget)->base[gtk_widget_get_state(widget)])); @@ -882,6 +891,7 @@
static void paste_unformatted_cb(GtkMenuItem *menu, GtkIMHtml *imhtml)
@@ -1158,11 +1168,12 @@
GtkIMHtml *imhtml = data;
+ gint length = gtk_selection_data_get_length(selection_data); if (!gtk_text_view_get_editable(GTK_TEXT_VIEW(imhtml)))
- if (imhtml->wbfo || selection_data->length <= 0) {
+ if (imhtml->wbfo || length <= 0) { gtk_clipboard_request_text(clipboard, paste_plaintext_received_cb, imhtml);
@@ -1186,13 +1197,13 @@
- text = g_malloc(selection_data->length + 1);
- memcpy(text, selection_data->data, selection_data->length);
+ text = g_malloc(length + 1); + memcpy(text, gtk_selection_data_get_data(selection_data), length); /* Make sure the paste data is null-terminated. Given that
* we're passed length (but assume later that it is
* null-terminated), this seems sensible to me.
- text[selection_data->length] = '\0';
@@ -1203,10 +1214,10 @@
- if (selection_data->length >= 2 &&
(*(guint16 *)text == 0xfeff || *(guint16 *)text == 0xfffe)) {
- char *utf8 = utf16_to_utf8_with_bom_check(text, selection_data->length);
+ char *utf8 = utf16_to_utf8_with_bom_check(text, length); @@ -1567,7 +1578,8 @@
gobject_class->finalize = gtk_imhtml_finalize;
widget_class->drag_motion = gtk_text_view_drag_motion;
- widget_class->expose_event = gtk_imhtml_expose_event;
+ /* TODO: I _think_ this should be removed for GTK+ 3.0 */ + /*widget_class->expose_event = gtk_imhtml_expose_event;*/ parent_size_allocate = widget_class->size_allocate;
widget_class->size_allocate = gtk_imhtml_size_allocate;
parent_style_set = widget_class->style_set;
@@ -1629,20 +1641,20 @@
TRUE, G_PARAM_READABLE));
binding_set = gtk_binding_set_by_class (parent_class);
- gtk_binding_entry_add_signal (binding_set, GDK_b, GDK_CONTROL_MASK, "format_function_toggle", 1, G_TYPE_INT, GTK_IMHTML_BOLD);
- gtk_binding_entry_add_signal (binding_set, GDK_i, GDK_CONTROL_MASK, "format_function_toggle", 1, G_TYPE_INT, GTK_IMHTML_ITALIC);
- gtk_binding_entry_add_signal (binding_set, GDK_u, GDK_CONTROL_MASK, "format_function_toggle", 1, G_TYPE_INT, GTK_IMHTML_UNDERLINE);
- gtk_binding_entry_add_signal (binding_set, GDK_plus, GDK_CONTROL_MASK, "format_function_toggle", 1, G_TYPE_INT, GTK_IMHTML_GROW);
- gtk_binding_entry_add_signal (binding_set, GDK_equal, GDK_CONTROL_MASK, "format_function_toggle", 1, G_TYPE_INT, GTK_IMHTML_GROW);
- gtk_binding_entry_add_signal (binding_set, GDK_minus, GDK_CONTROL_MASK, "format_function_toggle", 1, G_TYPE_INT, GTK_IMHTML_SHRINK);
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_b, GDK_CONTROL_MASK, "format_function_toggle", 1, G_TYPE_INT, GTK_IMHTML_BOLD); + gtk_binding_entry_add_signal (binding_set, GDK_KEY_i, GDK_CONTROL_MASK, "format_function_toggle", 1, G_TYPE_INT, GTK_IMHTML_ITALIC); + gtk_binding_entry_add_signal (binding_set, GDK_KEY_u, GDK_CONTROL_MASK, "format_function_toggle", 1, G_TYPE_INT, GTK_IMHTML_UNDERLINE); + gtk_binding_entry_add_signal (binding_set, GDK_KEY_plus, GDK_CONTROL_MASK, "format_function_toggle", 1, G_TYPE_INT, GTK_IMHTML_GROW); + gtk_binding_entry_add_signal (binding_set, GDK_KEY_equal, GDK_CONTROL_MASK, "format_function_toggle", 1, G_TYPE_INT, GTK_IMHTML_GROW); + gtk_binding_entry_add_signal (binding_set, GDK_KEY_minus, GDK_CONTROL_MASK, "format_function_toggle", 1, G_TYPE_INT, GTK_IMHTML_SHRINK); binding_set = gtk_binding_set_by_class(klass);
- gtk_binding_entry_add_signal (binding_set, GDK_r, GDK_CONTROL_MASK, "format_function_clear", 0);
- gtk_binding_entry_add_signal (binding_set, GDK_KP_Enter, 0, "message_send", 0);
- gtk_binding_entry_add_signal (binding_set, GDK_Return, 0, "message_send", 0);
- gtk_binding_entry_add_signal (binding_set, GDK_z, GDK_CONTROL_MASK, "undo", 0);
- gtk_binding_entry_add_signal (binding_set, GDK_z, GDK_CONTROL_MASK | GDK_SHIFT_MASK, "redo", 0);
- gtk_binding_entry_add_signal (binding_set, GDK_F14, 0, "undo", 0);
- gtk_binding_entry_add_signal(binding_set, GDK_v, GDK_CONTROL_MASK | GDK_SHIFT_MASK, "paste", 1, G_TYPE_STRING, "text");
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_r, GDK_CONTROL_MASK, "format_function_clear", 0); + gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Enter, 0, "message_send", 0); + gtk_binding_entry_add_signal (binding_set, GDK_KEY_Return, 0, "message_send", 0); + gtk_binding_entry_add_signal (binding_set, GDK_KEY_z, GDK_CONTROL_MASK, "undo", 0); + gtk_binding_entry_add_signal (binding_set, GDK_KEY_z, GDK_CONTROL_MASK | GDK_SHIFT_MASK, "redo", 0); + gtk_binding_entry_add_signal (binding_set, GDK_KEY_F14, 0, "undo", 0); + gtk_binding_entry_add_signal(binding_set, GDK_KEY_v, GDK_CONTROL_MASK | GDK_SHIFT_MASK, "paste", 1, G_TYPE_STRING, "text"); static void gtk_imhtml_init (GtkIMHtml *imhtml)
@@ -1869,13 +1881,13 @@
/* can't accept any of the offered targets */
GtkWidget *source_widget;
- suggested_action = context->suggested_action;
+ suggested_action = gdk_drag_context_get_suggested_action(context); source_widget = gtk_drag_get_source_widget (context);
if (source_widget == widget) {
/* Default to MOVE, unless the user has
* pressed ctrl or alt to affect available actions
- if ((context->actions & GDK_ACTION_MOVE) != 0)
+ if ((gdk_drag_context_get_actions(context) & GDK_ACTION_MOVE) != 0) suggested_action = GDK_ACTION_MOVE;
@@ -1907,20 +1919,21 @@
- char *text = (char *)sd->data;
+ char *text = (char *) gtk_selection_data_get_data(sd); GtkTextMark *mark = gtk_text_buffer_get_insert(imhtml->text_buffer);
+ gint length = gtk_selection_data_get_length(sd); gtk_text_buffer_get_iter_at_mark(imhtml->text_buffer, &iter, mark);
- if(gtk_imhtml_get_editable(imhtml) && sd->data){
+ if(gtk_imhtml_get_editable(imhtml) && text){ case GTK_IMHTML_DRAG_URL:
/* TODO: Is it really ok to change sd->data...? */
- purple_str_strip_char((char *)sd->data, '\r');
- links = g_strsplit((char *)sd->data, "\n", 0);
+ purple_str_strip_char(text, '\r'); + links = g_strsplit(text, "\n", 0); while((link = links[i]) != NULL){
if (gtk_imhtml_is_protocol(link)) {
@@ -1959,8 +1972,8 @@
* See also the comment on text/html here:
* http://mail.gnome.org/archives/gtk-devel-list/2001-September/msg00114.html
- if (sd->length >= 2 && !g_utf8_validate(text, sd->length - 1, NULL)) {
- utf8 = utf16_to_utf8_with_bom_check(text, sd->length);
+ if (length >= 2 && !g_utf8_validate(text, length - 1, NULL)) { + utf8 = utf16_to_utf8_with_bom_check(text, length); purple_debug_warning("gtkimhtml", "g_convert from UTF-16 failed in drag_rcv_cb\n");
@@ -1989,7 +2002,8 @@
gtk_drag_finish(dc, FALSE, FALSE, t);
- gtk_drag_finish(dc, TRUE, (dc->action == GDK_ACTION_MOVE), t);
+ gtk_drag_finish(dc, TRUE, + (gdk_drag_context_get_actions(dc) == GDK_ACTION_MOVE), t); gtk_drag_finish(dc, FALSE, FALSE, t);
@@ -2520,8 +2534,8 @@
static gboolean smooth_scroll_cb(gpointer data)
GtkIMHtml *imhtml = data;
- GtkAdjustment *adj = GTK_TEXT_VIEW(imhtml)->vadjustment;
- gdouble max_val = adj->upper - adj->page_size;
+ GtkAdjustment *adj = gtk_text_view_get_vadjustment(GTK_TEXT_VIEW(imhtml)); + gdouble max_val = gtk_adjustment_get_upper(adj) - gtk_adjustment_get_page_size(adj); gdouble scroll_val = gtk_adjustment_get_value(adj) + ((max_val - gtk_adjustment_get_value(adj)) / 3);
g_return_val_if_fail(imhtml->scroll_time != NULL, FALSE);
@@ -2544,9 +2558,10 @@
static gboolean scroll_idle_cb(gpointer data)
GtkIMHtml *imhtml = data;
- GtkAdjustment *adj = GTK_TEXT_VIEW(imhtml)->vadjustment;
+ GtkAdjustment *adj = gtk_text_view_get_vadjustment(GTK_TEXT_VIEW(imhtml)); - gtk_adjustment_set_value(adj, adj->upper - adj->page_size);
+ gtk_adjustment_set_value(adj, gtk_adjustment_get_upper(adj) - + gtk_adjustment_get_page_size(adj)); @@ -4186,9 +4201,14 @@
for (l = tags; l; l = l->next) {
GtkTextTag *tag = l->data;
- if (tag->name && !strncmp(tag->name, prefix, len))
+ g_object_get(G_OBJECT(tag), "name", &name, NULL); + if (name && !strncmp(name, prefix, len)) gtk_text_buffer_remove_tag(imhtml->text_buffer, tag, i, e);
@@ -4204,10 +4224,15 @@
for (l = tags; l; l = l->next) {
GtkTextTag *tag = l->data;
- if (tag->name && !strncmp(tag->name, prefix, len))
+ g_object_get(G_OBJECT(tag), "name", &name, NULL); + if (name && !strncmp(name, prefix, len)) gtk_text_buffer_remove_tag(imhtml->text_buffer, tag, &iter, e);
@@ -4327,11 +4352,16 @@
gtk_text_iter_begins_tag(start, tag) && /* the tag starts with the selection */
(!gtk_text_iter_has_tag(end, tag) || /* the tag ends within the selection */
gtk_text_iter_ends_tag(end, tag))) {
+ g_object_get(G_OBJECT(tag), "name", &name, NULL); gtk_text_buffer_remove_tag(imhtml->text_buffer, tag, start, end);
- strncmp(tag->name, "LINK ", 5) == 0 && imhtml->edit.link) {
+ if (name && strncmp(name, "LINK ", 5) == 0 && imhtml->edit.link) { gtk_imhtml_toggle_link(imhtml, NULL);
@@ -4553,27 +4583,32 @@
for (l = tags; l != NULL; l = l->next) {
GtkTextTag *tag = GTK_TEXT_TAG(l->data);
- if (strcmp(tag->name, "BOLD") == 0)
+ g_object_get(G_OBJECT(tag), "name", &name, NULL); + if (strcmp(name, "BOLD") == 0) imhtml->edit.bold = TRUE;
- else if (strcmp(tag->name, "ITALICS") == 0)
+ else if (strcmp(name, "ITALICS") == 0) imhtml->edit.italic = TRUE;
- else if (strcmp(tag->name, "UNDERLINE") == 0)
+ else if (strcmp(name, "UNDERLINE") == 0) imhtml->edit.underline = TRUE;
- else if (strcmp(tag->name, "STRIKE") == 0)
+ else if (strcmp(name, "STRIKE") == 0) imhtml->edit.strike = TRUE;
- else if (strncmp(tag->name, "FORECOLOR ", 10) == 0)
- imhtml->edit.forecolor = g_strdup(&(tag->name)[10]);
- else if (strncmp(tag->name, "BACKCOLOR ", 10) == 0)
- imhtml->edit.backcolor = g_strdup(&(tag->name)[10]);
- else if (strncmp(tag->name, "FONT FACE ", 10) == 0)
- imhtml->edit.fontface = g_strdup(&(tag->name)[10]);
- else if (strncmp(tag->name, "FONT SIZE ", 10) == 0)
- imhtml->edit.fontsize = strtol(&(tag->name)[10], NULL, 10);
- else if ((strncmp(tag->name, "LINK ", 5) == 0) && !gtk_text_iter_is_end(&iter))
+ else if (strncmp(name, "FORECOLOR ", 10) == 0) + imhtml->edit.forecolor = g_strdup(&(name)[10]); + else if (strncmp(name, "BACKCOLOR ", 10) == 0) + imhtml->edit.backcolor = g_strdup(&(name)[10]); + else if (strncmp(name, "FONT FACE ", 10) == 0) + imhtml->edit.fontface = g_strdup(&(name)[10]); + else if (strncmp(name, "FONT SIZE ", 10) == 0) + imhtml->edit.fontsize = strtol(&(name)[10], NULL, 10); + else if ((strncmp(name, "LINK ", 5) == 0) && !gtk_text_iter_is_end(&iter)) @@ -4864,6 +4899,8 @@
gtk_text_buffer_end_user_action(imhtml->text_buffer);
+/* TODO: I think this can be removed for GTK+ 3.0... */ image_expose(GtkWidget *widget, GdkEventExpose *event, gpointer user_data)
@@ -4871,9 +4908,10 @@
/* In case the smiley gets removed from the imhtml before it gets removed from the queue */
-static void animated_smiley_destroy_cb(GtkObject *widget, GtkIMHtml *imhtml)
+static void animated_smiley_destroy_cb(GtkWidget *widget, GtkIMHtml *imhtml) GList *l = imhtml->animations->head;
@@ -4966,8 +5004,10 @@
* images, and ensures that they are handled by the image
* itself, without propagating to the textview and causing
+ /* TODO: I think this should be removed for GTK+ 3.0? g_signal_connect(G_OBJECT(icon), "expose-event", G_CALLBACK(image_expose), NULL);
gtk_container_add(GTK_CONTAINER(ebox), icon);
@@ -5068,23 +5108,30 @@
static const gchar *tag_to_html_start(GtkTextTag *tag)
+ g_object_get(G_OBJECT(tag), "name", &name, NULL); g_return_val_if_fail(name != NULL, "");
if (strcmp(name, "BOLD") == 0) {
} else if (strcmp(name, "ITALICS") == 0) {
} else if (strcmp(name, "UNDERLINE") == 0) {
} else if (strcmp(name, "STRIKE") == 0) {
} else if (strncmp(name, "LINK ", 5) == 0) {
char *tmp = g_object_get_data(G_OBJECT(tag), "link_url");
g_snprintf(buf, sizeof(buf), "<a href=\"%s\">", tmp);
buf[sizeof(buf)-1] = '\0';
@@ -5093,19 +5140,30 @@
} else if (strncmp(name, "FORECOLOR ", 10) == 0) {
g_snprintf(buf, sizeof(buf), "<font color=\"%s\">", &name[10]);
} else if (strncmp(name, "BACKCOLOR ", 10) == 0) {
g_snprintf(buf, sizeof(buf), "<font back=\"%s\">", &name[10]);
} else if (strncmp(name, "BACKGROUND ", 10) == 0) {
g_snprintf(buf, sizeof(buf), "<body bgcolor=\"%s\">", &name[11]);
} else if (strncmp(name, "FONT FACE ", 10) == 0) {
g_snprintf(buf, sizeof(buf), "<font face=\"%s\">", &name[10]);
} else if (strncmp(name, "FONT SIZE ", 10) == 0) {
g_snprintf(buf, sizeof(buf), "<font size=\"%s\">", &name[10]);
@@ -5167,38 +5225,49 @@
g_snprintf(str, sizeof(buf) - (str - buf), "'>");
return (empty ? "" : buf);
static const gchar *tag_to_html_end(GtkTextTag *tag)
+ g_object_get(G_OBJECT(tag), "name", &name, NULL); g_return_val_if_fail(name != NULL, "");
if (strcmp(name, "BOLD") == 0) {
} else if (strcmp(name, "ITALICS") == 0) {
} else if (strcmp(name, "UNDERLINE") == 0) {
} else if (strcmp(name, "STRIKE") == 0) {
} else if (strncmp(name, "LINK ", 5) == 0) {
} else if (strncmp(name, "FORECOLOR ", 10) == 0) {
} else if (strncmp(name, "BACKCOLOR ", 10) == 0) {
} else if (strncmp(name, "BACKGROUND ", 10) == 0) {
} else if (strncmp(name, "FONT FACE ", 10) == 0) {
} else if (strncmp(name, "FONT SIZE ", 10) == 0) {
const char *props[] = {"weight-set", "foreground-set", "background-set",
"size-set", "underline-set", NULL};
@@ -5210,6 +5279,8 @@
--- a/pidgin/gtkimhtmltoolbar.c Mon Nov 22 10:18:15 2010 +0000
+++ b/pidgin/gtkimhtmltoolbar.c Thu Nov 25 22:30:18 2010 +0000
@@ -124,11 +124,15 @@
- sel = GTK_FONT_SELECTION(GTK_FONT_SELECTION_DIALOG(toolbar->font_dialog)->fontsel);
- gtk_widget_hide_all(gtk_widget_get_parent(sel->size_entry));
- gtk_widget_show_all(sel->family_list);
- gtk_widget_show(gtk_widget_get_parent(sel->family_list));
- gtk_widget_show(gtk_widget_get_parent(gtk_widget_get_parent(sel->family_list)));
+ sel = GTK_FONT_SELECTION( + gtk_font_selection_dialog_get_font_selection(GTK_FONT_SELECTION_DIALOG(toolbar->font_dialog))); + gtk_widget_hide(gtk_widget_get_parent( + gtk_font_selection_get_size_entry(sel))); + gtk_widget_show_all(gtk_font_selection_get_family_list(sel)); + gtk_widget_show(gtk_widget_get_parent( + gtk_font_selection_get_family_list(sel))); + gtk_widget_show(gtk_widget_get_parent(gtk_widget_get_parent( + gtk_font_selection_get_family_list(sel)))); @@ -191,10 +195,12 @@
g_signal_connect(G_OBJECT(toolbar->font_dialog), "delete_event",
G_CALLBACK(destroy_toolbar_font), toolbar);
- g_signal_connect(G_OBJECT(GTK_FONT_SELECTION_DIALOG(toolbar->font_dialog)->ok_button), "clicked",
- G_CALLBACK(apply_font), toolbar->font_dialog);
- g_signal_connect(G_OBJECT(GTK_FONT_SELECTION_DIALOG(toolbar->font_dialog)->cancel_button), "clicked",
- G_CALLBACK(cancel_toolbar_font), toolbar);
+ g_signal_connect(G_OBJECT( + gtk_font_selection_dialog_get_ok_button(GTK_FONT_SELECTION_DIALOG(toolbar->font_dialog))), + "clicked", G_CALLBACK(apply_font), toolbar->font_dialog); + g_signal_connect(G_OBJECT( + gtk_font_selection_dialog_get_cancel_button(GTK_FONT_SELECTION_DIALOG(toolbar->font_dialog))), + "clicked", G_CALLBACK(cancel_toolbar_font), toolbar); g_signal_connect_after(G_OBJECT(toolbar->font_dialog), "realize",
G_CALLBACK(realize_toolbar_font), toolbar);
@@ -253,9 +259,12 @@
char *color = gtk_imhtml_get_current_forecolor(GTK_IMHTML(toolbar->imhtml));
if (!toolbar->fgcolor_dialog) {
+ GtkWidget *cancel_button; toolbar->fgcolor_dialog = gtk_color_selection_dialog_new(_("Select Text Color"));
- colorsel = GTK_COLOR_SELECTION_DIALOG(toolbar->fgcolor_dialog)->colorsel;
+ gtk_color_selection_dialog_get_color_selection(GTK_COLOR_SELECTION_DIALOG(toolbar->fgcolor_dialog)); gdk_color_parse(color, &fgcolor);
gtk_color_selection_set_current_color(GTK_COLOR_SELECTION(colorsel), &fgcolor);
@@ -264,12 +273,14 @@
g_object_set_data(G_OBJECT(colorsel), "purple_toolbar", toolbar);
+ g_object_get(G_OBJECT(toolbar->fgcolor_dialog), "ok-button", &ok_button, NULL); + g_object_get(G_OBJECT(toolbar->fgcolor_dialog), "cancel-button", g_signal_connect(G_OBJECT(toolbar->fgcolor_dialog), "delete_event",
G_CALLBACK(destroy_toolbar_fgcolor), toolbar);
- g_signal_connect(G_OBJECT(GTK_COLOR_SELECTION_DIALOG(toolbar->fgcolor_dialog)->ok_button), "clicked",
- G_CALLBACK(do_fgcolor), colorsel);
- g_signal_connect(G_OBJECT (GTK_COLOR_SELECTION_DIALOG(toolbar->fgcolor_dialog)->cancel_button), "clicked",
- G_CALLBACK(cancel_toolbar_fgcolor), toolbar);
+ g_signal_connect(G_OBJECT(ok_button), "clicked", G_CALLBACK(do_fgcolor), colorsel); + g_signal_connect(G_OBJECT(cancel_button), "clicked", + G_CALLBACK(cancel_toolbar_fgcolor), toolbar); gtk_window_present(GTK_WINDOW(toolbar->fgcolor_dialog));
@@ -333,10 +344,14 @@
char *color = gtk_imhtml_get_current_backcolor(GTK_IMHTML(toolbar->imhtml));
if (!toolbar->bgcolor_dialog) {
+ GtkWidget *cancel_button; toolbar->bgcolor_dialog = gtk_color_selection_dialog_new(_("Select Background Color"));
- colorsel = GTK_COLOR_SELECTION_DIALOG(toolbar->bgcolor_dialog)->colorsel;
+ gtk_color_selection_dialog_get_color_selection(GTK_COLOR_SELECTION_DIALOG(toolbar->fgcolor_dialog)); gdk_color_parse(color, &bgcolor);
gtk_color_selection_set_current_color(GTK_COLOR_SELECTION(colorsel), &bgcolor);
@@ -344,11 +359,14 @@
g_object_set_data(G_OBJECT(colorsel), "purple_toolbar", toolbar);
+ g_object_get(G_OBJECT(toolbar->bgcolor_dialog), "ok-button", &ok_button, NULL); + g_object_get(G_OBJECT(toolbar->bgcolor_dialog), "cancel-button", g_signal_connect(G_OBJECT(toolbar->bgcolor_dialog), "delete_event",
G_CALLBACK(destroy_toolbar_bgcolor), toolbar);
- g_signal_connect(G_OBJECT(GTK_COLOR_SELECTION_DIALOG(toolbar->bgcolor_dialog)->ok_button), "clicked",
- G_CALLBACK(do_bgcolor), colorsel);
- g_signal_connect(G_OBJECT(GTK_COLOR_SELECTION_DIALOG(toolbar->bgcolor_dialog)->cancel_button), "clicked",
+ g_signal_connect(G_OBJECT(ok_button), "clicked", + G_CALLBACK(do_bgcolor), colorsel); + g_signal_connect(G_OBJECT(cancel_button), "clicked", G_CALLBACK(cancel_toolbar_bgcolor), toolbar);
@@ -722,7 +740,7 @@
smiley_dialog_input_cb(GtkWidget *dialog, GdkEvent *event, GtkIMHtmlToolbar *toolbar)
- if ((event->type == GDK_KEY_PRESS && event->key.keyval == GDK_Escape) ||
+ if ((event->type == GDK_KEY_PRESS && event->key.keyval == GDK_KEY_Escape) || (event->type == GDK_BUTTON_PRESS && event->button.button == 1))
close_smiley_dialog(toolbar);
@@ -1095,19 +1113,21 @@
GtkWidget *widget = GTK_WIDGET(data);
- gint ythickness = widget->style->ythickness;
+ GtkAllocation allocation; + gint ythickness = gtk_widget_get_style(widget)->ythickness; + gtk_widget_get_allocation(widget, &allocation); gtk_widget_size_request(GTK_WIDGET (menu), &menu_req);
- gdk_window_get_origin(widget->window, x, y);
- *x += widget->allocation.x;
- *y += widget->allocation.y + widget->allocation.height;
+ gdk_window_get_origin(gtk_widget_get_window(widget), x, y); + *y += allocation.y + allocation.height; pidgin_menu_position_func_helper(menu, x, y, push_in, data);
if (savy > *y + ythickness + 1)
- *y -= widget->allocation.height;
+ *y -= allocation.height; @@ -1199,7 +1219,7 @@
- wide = GTK_WIDGET_VISIBLE(toolbar->bold);
+ wide = gtk_widget_get_visible(toolbar->bold); item = gtk_menu_item_new_with_mnemonic(wide ? _("Group Items") : _("Ungroup Items"));
@@ -1294,7 +1314,7 @@
button_visibility_changed(GtkWidget *button, gpointer dontcare, GtkWidget *item)
- if (GTK_WIDGET_VISIBLE(button))
+ if (gtk_widget_get_visible(button)) @@ -1303,7 +1323,7 @@
button_sensitiveness_changed(GtkWidget *button, gpointer dontcare, GtkWidget *item)
- gtk_widget_set_sensitive(item, GTK_WIDGET_IS_SENSITIVE(button));
+ gtk_widget_set_sensitive(item, gtk_widget_get_sensitive(button)); @@ -1326,10 +1346,10 @@
gconstpointer value, gpointer toolbar)
- gtk_widget_hide_all(g_object_get_data(G_OBJECT(toolbar), "lean-view"));
+ gtk_widget_hide(g_object_get_data(G_OBJECT(toolbar), "lean-view")); gtk_widget_show_all(g_object_get_data(G_OBJECT(toolbar), "wide-view"));
- gtk_widget_hide_all(g_object_get_data(G_OBJECT(toolbar), "wide-view"));
+ gtk_widget_hide(g_object_get_data(G_OBJECT(toolbar), "wide-view")); gtk_widget_show_all(g_object_get_data(G_OBJECT(toolbar), "lean-view"));
--- a/pidgin/gtkrequest.c Mon Nov 22 10:18:15 2010 +0000
+++ b/pidgin/gtkrequest.c Thu Nov 25 22:30:18 2010 +0000
@@ -105,8 +105,10 @@
if (GTK_IS_DIALOG(cont)) {
- gtk_box_pack_start(GTK_BOX(GTK_DIALOG(cont)->action_area), image, FALSE, TRUE, 0);
- gtk_box_reorder_child(GTK_BOX(GTK_DIALOG(cont)->action_area), image, 0);
+ gtk_box_pack_start(GTK_BOX(gtk_dialog_get_action_area(GTK_DIALOG(cont))), + image, FALSE, TRUE, 0); + gtk_box_reorder_child(GTK_BOX(gtk_dialog_get_action_area(GTK_DIALOG(cont))), } else if (GTK_IS_HBOX(cont)) {
gtk_misc_set_alignment(GTK_MISC(image), 0, 0);
gtk_box_pack_end(GTK_BOX(cont), image, FALSE, TRUE, 0);
@@ -263,7 +265,7 @@
generic_response_start(data);
- if (!GTK_WIDGET_HAS_FOCUS(button))
+ if (!gtk_widget_has_focus(button)) gtk_widget_grab_focus(button);
if (data->cbs[0] != NULL)
@@ -359,16 +361,21 @@
gtk_container_set_border_width(GTK_CONTAINER(dialog), PIDGIN_HIG_BORDER/2);
- gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), PIDGIN_HIG_BORDER/2);
+ gtk_container_set_border_width(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), + PIDGIN_HIG_BORDER / 2); gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE);
+ /* TODO: not sure how to do this with GTK+ 3 gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE);
gtk_dialog_set_default_response(GTK_DIALOG(dialog), 0);
- gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(dialog)->vbox), PIDGIN_HIG_BORDER);
+ gtk_box_set_spacing(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), /* Setup the main horizontal box */
hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BORDER);
- gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox);
+ gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), img = gtk_image_new_from_stock(PIDGIN_STOCK_DIALOG_QUESTION,
@@ -536,14 +543,19 @@
gtk_container_set_border_width(GTK_CONTAINER(dialog), PIDGIN_HIG_BORDER/2);
- gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), PIDGIN_HIG_BORDER/2);
+ gtk_container_set_border_width(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), + PIDGIN_HIG_BORDER / 2); gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE);
- gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE);
- gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(dialog)->vbox), PIDGIN_HIG_BORDER);
+ /* TODO: don't know if this is possible with GTK+ 3 + gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE); + gtk_box_set_spacing(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), /* Setup the main horizontal box */
hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BORDER);
- gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox);
+ gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), img = gtk_image_new_from_stock(PIDGIN_STOCK_DIALOG_QUESTION,
@@ -658,14 +670,19 @@
gtk_container_set_border_width(GTK_CONTAINER(dialog), PIDGIN_HIG_BORDER/2);
- gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), PIDGIN_HIG_BORDER/2);
+ gtk_container_set_border_width(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), + PIDGIN_HIG_BORDER / 2); gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE);
- gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE);
- gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(dialog)->vbox), PIDGIN_HIG_BORDER);
+ /* TODO: this is probably not supported by GTK+ 3 + gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE); + gtk_box_set_spacing(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), /* Setup the main horizontal box */
hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BORDER);
- gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox);
+ gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), @@ -736,8 +753,8 @@
if (default_action == PURPLE_DEFAULT_ACTION_NONE) {
- GTK_WIDGET_SET_FLAGS(img, GTK_CAN_DEFAULT);
- GTK_WIDGET_SET_FLAGS(img, GTK_CAN_FOCUS);
+ gtk_widget_set_can_default(img, TRUE); + gtk_widget_set_can_focus(img, TRUE); gtk_widget_grab_focus(img);
gtk_widget_grab_default(img);
@@ -982,12 +999,12 @@
- widget = gtk_combo_box_new_text();
+ widget = gtk_combo_box_text_new(); for (l = labels; l != NULL; l = l->next)
const char *text = l->data;
- gtk_combo_box_append_text(GTK_COMBO_BOX(widget), text);
+ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(widget), text); gtk_combo_box_set_active(GTK_COMBO_BOX(widget),
@@ -1264,12 +1281,12 @@
button = pidgin_dialog_add_button(GTK_DIALOG(win), text_to_stock(cancel_text), G_CALLBACK(multifield_cancel_cb), data);
- GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
+ gtk_widget_set_can_default(button, TRUE); button = pidgin_dialog_add_button(GTK_DIALOG(win), text_to_stock(ok_text), G_CALLBACK(multifield_ok_cb), data);
data->ok_button = button;
- GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
+ gtk_widget_set_can_default(button, TRUE); gtk_window_set_default(GTK_WINDOW(win), button);
pidgin_widget_decorate_account(hbox, account);
--- a/pidgin/gtkstatusbox.c Mon Nov 22 10:18:15 2010 +0000
+++ b/pidgin/gtkstatusbox.c Thu Nov 25 22:30:18 2010 +0000
@@ -82,9 +82,9 @@
static void status_menu_refresh_iter(PidginStatusBox *status_box, gboolean status_changed);
static void pidgin_status_box_regenerate(PidginStatusBox *status_box, gboolean status_changed);
static void pidgin_status_box_changed(PidginStatusBox *box);
-static void pidgin_status_box_size_request (GtkWidget *widget, GtkRequisition *requisition);
+/*static void pidgin_status_box_size_request (GtkWidget *widget, GtkRequisition *requisition);*/ static void pidgin_status_box_size_allocate (GtkWidget *widget, GtkAllocation *allocation);
-static gboolean pidgin_status_box_expose_event (GtkWidget *widget, GdkEventExpose *event);
+/*static gboolean pidgin_status_box_expose_event (GtkWidget *widget, GdkEventExpose *event);*/ static void pidgin_status_box_redisplay_buddy_icon(PidginStatusBox *status_box);
static void pidgin_status_box_forall (GtkContainer *container, gboolean include_internals, GtkCallback callback, gpointer callback_data);
static void pidgin_status_box_popup(PidginStatusBox *box);
@@ -282,7 +282,7 @@
if (!message || !*message)
- gtk_widget_hide_all(status_box->vbox);
+ gtk_widget_hide(status_box->vbox); status_box->imhtml_visible = FALSE;
@@ -343,9 +343,10 @@
icon_box_dnd_cb(GtkWidget *widget, GdkDragContext *dc, gint x, gint y,
GtkSelectionData *sd, guint info, guint t, PidginStatusBox *box)
- gchar *name = (gchar *)sd->data;
- if ((sd->length >= 0) && (sd->format == 8)) {
+ gchar *name = (gchar *) gtk_selection_data_get_data(sd); + if ((gtk_selection_data_get_length(sd) >= 0) + && (gtk_selection_data_get_format(sd) == 8)) { /* Well, it looks like the drag event was cool.
* Let's do something with it */
if (!g_ascii_strncasecmp(name, "file://", 7)) {
@@ -419,7 +420,7 @@
icon_box_enter_cb(GtkWidget *widget, GdkEventCrossing *event, PidginStatusBox *box)
- gdk_window_set_cursor(widget->window, box->hand_cursor);
+ gdk_window_set_cursor(gtk_widget_get_window(widget), box->hand_cursor); gtk_image_set_from_pixbuf(GTK_IMAGE(box->icon), box->buddy_icon_hover);
@@ -427,7 +428,7 @@
icon_box_leave_cb(GtkWidget *widget, GdkEventCrossing *event, PidginStatusBox *box)
- gdk_window_set_cursor(widget->window, box->arrow_cursor);
+ gdk_window_set_cursor(gtk_widget_get_window(widget), box->arrow_cursor); gtk_image_set_from_pixbuf(GTK_IMAGE(box->icon), box->buddy_icon) ;
@@ -615,9 +616,11 @@
parent_class = g_type_class_peek_parent(klass);
widget_class = (GtkWidgetClass*)klass;
- widget_class->size_request = pidgin_status_box_size_request;
+ /* this seems to be removed in GTK+ 3...*/ + /*widget_class->size_request = pidgin_status_box_size_request;*/ widget_class->size_allocate = pidgin_status_box_size_allocate;
- widget_class->expose_event = pidgin_status_box_expose_event;
+ /* this seems to be removed in GTK+ 3...*/ + /*widget_class->expose_event = pidgin_status_box_expose_event;*/ container_class->child_type = pidgin_status_box_child_type;
container_class->forall = pidgin_status_box_forall;
@@ -931,7 +934,7 @@
if (!purple_savedstatus_is_transient(saved_status) || !message || !*message)
status_box->imhtml_visible = FALSE;
- gtk_widget_hide_all(status_box->vbox);
+ gtk_widget_hide(status_box->vbox); @@ -1135,7 +1138,7 @@
static gboolean imhtml_remove_focus(GtkWidget *w, GdkEventKey *event, PidginStatusBox *status_box)
- if (event->keyval == GDK_Tab || event->keyval == GDK_KP_Tab || event->keyval == GDK_ISO_Left_Tab)
+ if (event->keyval == GDK_KEY_Tab || event->keyval == GDK_KEY_KP_Tab || event->keyval == GDK_KEY_ISO_Left_Tab) /* If last inserted character is a tab, then remove the focus from here */
GtkWidget *top = gtk_widget_get_toplevel(w);
@@ -1148,7 +1151,7 @@
/* Reset the status if Escape was pressed */
- if (event->keyval == GDK_Escape)
+ if (event->keyval == GDK_KEY_Escape) purple_timeout_remove(status_box->typing);
@@ -1299,13 +1302,15 @@
GtkRequisition popup_req;
GtkPolicyType hpolicy, vpolicy;
- gdk_window_get_origin (GTK_WIDGET(status_box)->window, x, y);
- *x += GTK_WIDGET(status_box)->allocation.x;
- *y += GTK_WIDGET(status_box)->allocation.y;
- *width = GTK_WIDGET(status_box)->allocation.width;
+ GtkAllocation allocation; + gtk_widget_get_allocation(GTK_WIDGET(status_box), &allocation); + gdk_window_get_origin (gtk_widget_get_window(GTK_WIDGET(status_box)), x, y); + *width = allocation.width; hpolicy = vpolicy = GTK_POLICY_NEVER;
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (status_box->scrolled_window),
@@ -1324,7 +1329,7 @@
screen = gtk_widget_get_screen (GTK_WIDGET (status_box));
monitor_num = gdk_screen_get_monitor_at_window (screen,
- GTK_WIDGET (status_box)->window);
+ gtk_widget_get_window(GTK_WIDGET (status_box))); gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor);
@@ -1332,13 +1337,13 @@
else if (*x + *width > monitor.x + monitor.width)
*x = monitor.x + monitor.width - *width;
- if (*y + GTK_WIDGET(status_box)->allocation.height + *height <= monitor.y + monitor.height)
- *y += GTK_WIDGET(status_box)->allocation.height;
+ if (*y + allocation.height + *height <= monitor.y + monitor.height) + *y += allocation.height; else if (*y - *height >= monitor.y)
- else if (monitor.y + monitor.height - (*y + GTK_WIDGET(status_box)->allocation.height) > *y - monitor.y)
+ else if (monitor.y + monitor.height - (*y + allocation.height) > *y - monitor.y) - *y += GTK_WIDGET(status_box)->allocation.height;
+ *y += allocation.height; *height = monitor.y + monitor.height - *y;
@@ -1369,7 +1374,7 @@
if (!grab_keyboard || gdk_keyboard_grab (window, TRUE, activate_time) == 0)
- gdk_display_pointer_ungrab (gdk_drawable_get_display (window), activate_time);
+ gdk_display_pointer_ungrab (gdk_window_get_display (window), activate_time); @@ -1388,7 +1393,7 @@
gtk_window_move (GTK_WINDOW (box->popup_window), x, y);
gtk_widget_show(box->popup_window);
gtk_widget_grab_focus (box->tree_view);
- if (!popup_grab_on_window (box->popup_window->window,
+ if (!popup_grab_on_window (gtk_widget_get_window(box->popup_window), GDK_CURRENT_TIME, TRUE)) {
gtk_widget_hide (box->popup_window);
@@ -1419,10 +1424,10 @@
toggle_key_press_cb(GtkWidget *widget, GdkEventKey *event, PidginStatusBox *box)
if (!box->popup_in_progress) {
pidgin_status_box_popup (box);
box->popup_in_progress = TRUE;
@@ -1654,7 +1659,7 @@
GdkEventKey *event, PidginStatusBox *box)
if (box->popup_in_progress) {
- if (event->keyval == GDK_Escape) {
+ if (event->keyval == GDK_KEY_Escape) { pidgin_status_box_popdown(box);
@@ -1665,9 +1670,9 @@
if (gtk_tree_selection_get_selected(sel, NULL, &iter)) {
path = gtk_tree_model_get_path(GTK_TREE_MODEL(box->dropdown_store), &iter);
- if (event->keyval == GDK_Return) {
+ if (event->keyval == GDK_KEY_Return) { treeview_activate_current_selection(box, path);
- } else if (event->keyval == GDK_Delete) {
+ } else if (event->keyval == GDK_KEY_Delete) { tree_view_delete_current_selection(box, path);
@@ -1743,7 +1748,7 @@
- GTK_WIDGET_SET_FLAGS (status_box, GTK_NO_WINDOW);
+ gtk_widget_set_has_window(GTK_WIDGET(status_box), FALSE); status_box->imhtml_visible = FALSE;
status_box->network_available = purple_network_is_available();
status_box->connecting = FALSE;
@@ -1927,12 +1932,14 @@
+/* TODO: is this needed in GTK+ 3? */ pidgin_status_box_size_request(GtkWidget *widget,
GtkRequisition *requisition)
- gint border_width = GTK_CONTAINER (widget)->border_width;
+ gint border_width = gtk_container_get_border_width(GTK_CONTAINER (widget)); gtk_widget_size_request(PIDGIN_STATUS_BOX(widget)->toggle_button, requisition);
@@ -1947,6 +1954,7 @@
@@ -1995,7 +2003,7 @@
PidginStatusBox *status_box = PIDGIN_STATUS_BOX(widget);
GtkRequisition req = {0,0};
GtkAllocation parent_alc, box_alc, icon_alc;
- gint border_width = GTK_CONTAINER (widget)->border_width;
+ gint border_width = gtk_container_get_border_width(GTK_CONTAINER (widget)); gtk_widget_size_request(status_box->toggle_button, &req);
/* Make this icon the same size as other buddy icons in the list; unless it already wants to be bigger */
@@ -2034,9 +2042,11 @@
gtk_widget_size_allocate(status_box->icon_box, &icon_alc);
gtk_widget_size_allocate(status_box->toggle_button, &parent_alc);
- widget->allocation = *allocation;
+ gtk_widget_set_allocation(GTK_WIDGET(status_box), allocation); +/* TODO: don't think this is nessesary in GTK+ 3 */ pidgin_status_box_expose_event(GtkWidget *widget,
@@ -2051,6 +2061,7 @@
pidgin_status_box_forall(GtkContainer *container,
@@ -2333,7 +2344,7 @@
message = pidgin_status_box_get_message(status_box);
if (!message || !*message)
- gtk_widget_hide_all(status_box->vbox);
+ gtk_widget_hide(status_box->vbox); status_box->imhtml_visible = FALSE;
@@ -2605,7 +2616,7 @@
purple_timeout_remove(status_box->typing);
- if (GTK_WIDGET_IS_SENSITIVE(GTK_WIDGET(status_box)))
+ if (gtk_widget_get_sensitive(GTK_WIDGET(status_box))) if (type == PIDGIN_STATUS_BOX_TYPE_POPULAR || type == PIDGIN_STATUS_BOX_TYPE_SAVED_POPULAR)
@@ -2667,7 +2678,7 @@
- if (GTK_WIDGET_IS_SENSITIVE(GTK_WIDGET(status_box)))
+ if (gtk_widget_get_sensitive(GTK_WIDGET(status_box))) if (status_box->imhtml_visible)
@@ -2687,7 +2698,7 @@
- gtk_widget_hide_all(status_box->vbox);
+ gtk_widget_hide(status_box->vbox); activate_currently_selected_status(status_box); /* This is where we actually set the status */
@@ -2723,7 +2734,7 @@
static void imhtml_changed_cb(GtkTextBuffer *buffer, void *data)
PidginStatusBox *status_box = (PidginStatusBox*)data;
- if (GTK_WIDGET_IS_SENSITIVE(GTK_WIDGET(status_box)))
+ if (gtk_widget_get_sensitive(GTK_WIDGET(status_box))) if (status_box->typing != 0) {
pidgin_status_box_pulse_typing(status_box);
--- a/pidgin/gtkutils.c Mon Nov 22 10:18:15 2010 +0000
+++ b/pidgin/gtkutils.c Thu Nov 25 22:30:18 2010 +0000
@@ -188,7 +188,7 @@
pidgin_dialog_get_vbox_with_properties(GtkDialog *dialog, gboolean homogeneous, gint spacing)
- GtkBox *vbox = GTK_BOX(GTK_DIALOG(dialog)->vbox);
+ GtkBox *vbox = GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))); gtk_box_set_homogeneous(vbox, homogeneous);
gtk_box_set_spacing(vbox, spacing);
@@ -196,12 +196,12 @@
GtkWidget *pidgin_dialog_get_vbox(GtkDialog *dialog)
- return GTK_DIALOG(dialog)->vbox;
+ return gtk_dialog_get_content_area(GTK_DIALOG(dialog)); GtkWidget *pidgin_dialog_get_action_area(GtkDialog *dialog)
- return GTK_DIALOG(dialog)->action_area;
+ return gtk_dialog_get_action_area(GTK_DIALOG(dialog)); GtkWidget *pidgin_dialog_add_button(GtkDialog *dialog, const char *label,
@@ -297,7 +297,7 @@
- sensitivity = GTK_WIDGET_IS_SENSITIVE(to_toggle);
+ sensitivity = gtk_widget_get_sensitive(to_toggle); gtk_widget_set_sensitive(to_toggle, !sensitivity);
@@ -314,7 +314,7 @@
- sensitivity = GTK_WIDGET_IS_SENSITIVE(element);
+ sensitivity = gtk_widget_get_sensitive(element); gtk_widget_set_sensitive(element, !sensitivity);
@@ -326,7 +326,7 @@
- if (GTK_WIDGET_VISIBLE(to_toggle))
+ if (gtk_widget_get_visible(to_toggle)) gtk_widget_hide(to_toggle);
gtk_widget_show(to_toggle);
@@ -1211,8 +1211,8 @@
widget = GTK_WIDGET(menu);
screen = gtk_widget_get_screen(widget);
- xthickness = widget->style->xthickness;
- ythickness = widget->style->ythickness;
+ xthickness = gtk_widget_get_style(widget)->xthickness; + ythickness = gtk_widget_get_style(widget)->ythickness; rtl = (gtk_widget_get_direction(widget) == GTK_TEXT_DIR_RTL);
@@ -1350,9 +1350,9 @@
- gint ythickness = GTK_WIDGET(menu)->style->ythickness;
- gdk_window_get_origin (widget->window, x, y);
+ gint ythickness = gtk_widget_get_style(GTK_WIDGET(menu))->ythickness; + gdk_window_get_origin (gtk_widget_get_window(widget), x, y); gtk_tree_view_get_cursor (tv, &path, &col);
gtk_tree_view_get_cell_area (tv, path, col, &rect);
@@ -1466,7 +1466,7 @@
pidgin_dnd_file_manage(GtkSelectionData *sd, PurpleAccount *account, const char *who)
- GList *files = purple_uri_list_extract_filenames((const gchar *)sd->data);
+ GList *files = purple_uri_list_extract_filenames((const gchar *) gtk_selection_data_get_data(sd)); PurpleConnection *gc = purple_account_get_connection(account);
PurplePluginProtocolInfo *prpl_info = NULL;
@@ -1784,7 +1784,9 @@
group = gtk_menu_get_accel_group(GTK_MENU(menu));
- char *path = g_strdup_printf("%s/%s", GTK_MENU_ITEM(menuitem)->accel_path, act->label);
+ char *path = g_strdup_printf("%s/%s", + gtk_menu_item_get_accel_path(GTK_MENU_ITEM(menuitem)), gtk_menu_set_accel_path(GTK_MENU(submenu), path);
gtk_menu_set_accel_group(GTK_MENU(submenu), group);
@@ -2107,23 +2109,23 @@
g_return_if_fail(widget != NULL);
- if (widget->window == NULL)
+ if (gtk_widget_get_window(widget) == NULL) cursor = gdk_cursor_new(cursor_type);
- gdk_window_set_cursor(widget->window, cursor);
+ gdk_window_set_cursor(gtk_widget_get_window(widget), cursor); gdk_cursor_unref(cursor);
- gdk_display_flush(gdk_drawable_get_display(GDK_DRAWABLE(widget->window)));
+ gdk_display_flush(gdk_window_get_display(gtk_widget_get_window(widget))); void pidgin_clear_cursor(GtkWidget *widget)
g_return_if_fail(widget != NULL);
- if (widget->window == NULL)
+ if (gtk_widget_get_window(widget) == NULL) - gdk_window_set_cursor(widget->window, NULL);
+ gdk_window_set_cursor(gtk_widget_get_window(widget), NULL); @@ -2810,18 +2812,18 @@
-combo_box_changed_cb(GtkComboBox *combo_box, GtkEntry *entry)
+combo_box_changed_cb(GtkComboBoxText *combo_box, GtkEntry *entry) - char *text = gtk_combo_box_get_active_text(combo_box);
+ char *text = gtk_combo_box_text_get_active_text(combo_box); gtk_entry_set_text(entry, text ? text : "");
-entry_key_pressed_cb(GtkWidget *entry, GdkEventKey *key, GtkComboBox *combo)
+entry_key_pressed_cb(GtkWidget *entry, GdkEventKey *key, GtkComboBoxText *combo) - if (key->keyval == GDK_Down || key->keyval == GDK_Up) {
- gtk_combo_box_popup(combo);
+ if (key->keyval == GDK_KEY_Down || key->keyval == GDK_KEY_Up) { + gtk_combo_box_popup(GTK_COMBO_BOX(combo)); @@ -2830,10 +2832,10 @@
pidgin_text_combo_box_entry_new(const char *default_item, GList *items)
- GtkComboBox *ret = NULL;
+ GtkComboBoxText *ret = NULL; GtkWidget *the_entry = NULL;
- ret = GTK_COMBO_BOX(gtk_combo_box_new_text());
+ ret = GTK_COMBO_BOX_TEXT(gtk_combo_box_text_new()); the_entry = gtk_entry_new();
gtk_container_add(GTK_CONTAINER(ret), the_entry);
@@ -2843,7 +2845,7 @@
for (; items != NULL ; items = items->next) {
char *text = items->data;
- gtk_combo_box_append_text(ret, text);
+ gtk_combo_box_text_append_text(ret, text); g_signal_connect(G_OBJECT(ret), "changed", (GCallback)combo_box_changed_cb, the_entry);
@@ -2854,12 +2856,12 @@
const char *pidgin_text_combo_box_entry_get_text(GtkWidget *widget)
- return gtk_entry_get_text(GTK_ENTRY(GTK_BIN((widget))->child));
+ return gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN((widget))))); void pidgin_text_combo_box_entry_set_text(GtkWidget *widget, const char *text)
- gtk_entry_set_text(GTK_ENTRY(GTK_BIN((widget))->child), (text));
+ gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN((widget)))), (text)); @@ -2980,12 +2982,12 @@
windows = g_list_delete_link(windows, windows);
- !GTK_WIDGET_VISIBLE(window)) {
+ !gtk_widget_get_visible(window)) { if (gtk_window_has_toplevel_focus(GTK_WINDOW(window)) ||
- (menu && menu == window->window)) {
+ (menu && menu == gtk_widget_get_window(window))) { --- a/pidgin/gtkwhiteboard.c Mon Nov 22 10:18:15 2010 +0000
+++ b/pidgin/gtkwhiteboard.c Thu Nov 25 22:30:18 2010 +0000
@@ -280,13 +280,13 @@
/* TODO Ask if user wants to save picture before the session is closed */
/* Clear graphical memory */
- cairo_t *cr = g_object_get_data(G_OBJECT(gtkwb->pixmap), "cairo-context");
+ cairo_t *cr = g_object_get_data(G_OBJECT(gtkwb->pixbuf), "cairo-context"); - g_object_unref(gtkwb->pixmap);
+ g_object_unref(gtkwb->pixbuf); colour_dialog = g_object_get_data(G_OBJECT(gtkwb->window), "colour-dialog");
@@ -356,28 +356,33 @@
static gboolean pidgin_whiteboard_configure_event(GtkWidget *widget, GdkEventConfigure *event, gpointer data)
PidginWhiteboard *gtkwb = (PidginWhiteboard*)data;
- GdkPixmap *pixmap = gtkwb->pixmap;
+ GdkPixbuf *pixbuf = gtkwb->pixbuf;
- cr = g_object_get_data(G_OBJECT(pixmap), "cairo-context");
+ GdkWindow *window = gtk_widget_get_window(widget); + GtkAllocation allocation; + cr = g_object_get_data(G_OBJECT(pixbuf), "cairo-context"); - g_object_unref(pixmap);
+ g_object_unref(pixbuf); - pixmap = gdk_pixmap_new(widget->window,
- widget->allocation.width,
- widget->allocation.height,
- gtkwb->pixmap = pixmap;
+ gtk_widget_get_allocation(widget, &allocation); + pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, + gdk_visual_get_depth(GDK_VISUAL(window)), + allocation.width, allocation.height); + gtkwb->pixbuf = pixbuf; - cr = gdk_cairo_create(GDK_DRAWABLE(pixmap));
- g_object_set_data(G_OBJECT(pixmap), "cairo-context", cr);
- gdk_cairo_set_source_color(cr, &widget->style->white);
+ cr = gdk_cairo_create(GDK_DRAWABLE(pixbuf)); + g_object_set_data(G_OBJECT(pixbuf), "cairo-context", cr); + gdk_cairo_set_source_color(cr, >k_widget_get_style(widget)->white); - widget->allocation.width, widget->allocation.height);
+ allocation.width, allocation.height); @@ -386,11 +391,11 @@
static gboolean pidgin_whiteboard_expose_event(GtkWidget *widget, GdkEventExpose *event, gpointer data)
PidginWhiteboard *gtkwb = (PidginWhiteboard*)(data);
- GdkPixmap *pixmap = gtkwb->pixmap;
+ GdkPixbuf *pixbuf = gtkwb->pixbuf; - cr = gdk_cairo_create(GDK_DRAWABLE(widget->window));
- gdk_cairo_set_source_pixmap(cr, pixmap, 0, 0);
+ cr = gdk_cairo_create(GDK_DRAWABLE(gtk_widget_get_window(widget))); + gdk_cairo_set_source_pixbuf(cr, pixbuf, 0, 0); event->area.x, event->area.y,
event->area.width, event->area.height);
@@ -403,7 +408,7 @@
static gboolean pidgin_whiteboard_brush_down(GtkWidget *widget, GdkEventButton *event, gpointer data)
PidginWhiteboard *gtkwb = (PidginWhiteboard*)data;
- GdkPixmap *pixmap = gtkwb->pixmap;
+ GdkPixbuf *pixbuf = gtkwb->pixbuf; PurpleWhiteboard *wb = gtkwb->wb;
GList *draw_list = wb->draw_list;
@@ -418,7 +423,7 @@
BrushState = BRUSH_STATE_DOWN;
- if(event->button == 1 && pixmap != NULL)
+ if(event->button == 1 && pixbuf != NULL) /* Check if draw_list has contents; if so, clear it */
@@ -456,7 +461,7 @@
PidginWhiteboard *gtkwb = (PidginWhiteboard*)data;
- GdkPixmap *pixmap = gtkwb->pixmap;
+ GdkPixbuf *pixbuf = gtkwb->pixbuf; PurpleWhiteboard *wb = gtkwb->wb;
GList *draw_list = wb->draw_list;
@@ -470,7 +475,7 @@
- if(state & GDK_BUTTON1_MASK && pixmap != NULL)
+ if(state & GDK_BUTTON1_MASK && pixbuf != NULL) if((BrushState != BRUSH_STATE_DOWN) && (BrushState != BRUSH_STATE_MOTION))
@@ -536,7 +541,7 @@
static gboolean pidgin_whiteboard_brush_up(GtkWidget *widget, GdkEventButton *event, gpointer data)
PidginWhiteboard *gtkwb = (PidginWhiteboard*)data;
- GdkPixmap *pixmap = gtkwb->pixmap;
+ GdkPixbuf *pixbuf = gtkwb->pixbuf; PurpleWhiteboard *wb = gtkwb->wb;
GList *draw_list = wb->draw_list;
@@ -551,7 +556,7 @@
BrushState = BRUSH_STATE_UP;
- if(event->button == 1 && pixmap != NULL)
+ if(event->button == 1 && pixbuf != NULL) /* If the brush was never moved, express two sets of two deltas That's a
* 'point,' but not for Yahoo!
@@ -593,9 +598,9 @@
PidginWhiteboard *gtkwb = wb->ui_data;
GtkWidget *widget = gtkwb->drawing_area;
- GdkPixmap *pixmap = gtkwb->pixmap;
+ GdkPixbuf *pixbuf = gtkwb->pixbuf; - cairo_t *gfx_con = g_object_get_data(G_OBJECT(pixmap), "cairo-context");
+ cairo_t *gfx_con = g_object_get_data(G_OBJECT(pixbuf), "cairo-context"); /* Interpret and convert color */
@@ -701,21 +706,24 @@
static void pidgin_whiteboard_clear(PurpleWhiteboard *wb)
PidginWhiteboard *gtkwb = wb->ui_data;
- GdkPixmap *pixmap = gtkwb->pixmap;
+ GdkPixbuf *pixbuf = gtkwb->pixbuf; GtkWidget *drawing_area = gtkwb->drawing_area;
- cairo_t *cr = g_object_get_data(G_OBJECT(pixmap), "cairo-context");
+ cairo_t *cr = g_object_get_data(G_OBJECT(pixbuf), "cairo-context"); + GtkAllocation allocation; - gdk_cairo_set_source_color(cr, &drawing_area->style->white);
+ gtk_widget_get_allocation(drawing_area, &allocation); + gdk_cairo_set_source_color(cr, >k_widget_get_style(drawing_area)->white); - drawing_area->allocation.width,
- drawing_area->allocation.height);
gtk_widget_queue_draw_area(drawing_area,
- drawing_area->allocation.width,
- drawing_area->allocation.height);
static void pidgin_whiteboard_button_clear_press(GtkWidget *widget, gpointer data)
@@ -781,12 +789,15 @@
gtk_widget_destroy(dialog);
/* Makes an icon from the whiteboard's canvas 'image' */
+ pixbuf = gtkwb->pixbuf; pixbuf = gdk_pixbuf_get_from_drawable(NULL,
(GdkDrawable*)(gtkwb->pixmap),
gdk_drawable_get_colormap(gtkwb->pixmap),
gtkwb->width, gtkwb->height);
if(gdk_pixbuf_save(pixbuf, filename, "jpeg", NULL, "quality", "100", NULL))
purple_debug_info("gtkwhiteboard", "File Saved...\n");
@@ -807,12 +818,15 @@
/* Makes an icon from the whiteboard's canvas 'image' */
+ pixbuf = gtkwb->pixbuf; pixbuf = gdk_pixbuf_get_from_drawable(NULL,
(GdkDrawable*)(gtkwb->pixmap),
gdk_drawable_get_colormap(gtkwb->pixmap),
gtkwb->width, gtkwb->height);
gtk_window_set_icon((GtkWindow*)(gtkwb->window), pixbuf);
@@ -853,23 +867,29 @@
GtkColorSelectionDialog *dialog;
dialog = (GtkColorSelectionDialog *)gtk_color_selection_dialog_new(_("Select color"));
g_object_set_data(G_OBJECT(gtkwb->window), "colour-dialog", dialog);
- g_signal_connect(G_OBJECT(dialog->colorsel), "color-changed",
+ g_signal_connect(G_OBJECT(gtk_color_selection_dialog_get_color_selection(dialog)), G_CALLBACK(change_color_cb), gtkwb);
gtk_widget_destroy(dialog->cancel_button);
gtk_widget_destroy(dialog->help_button);
- g_signal_connect(G_OBJECT(dialog->ok_button), "clicked",
+ g_object_get(G_OBJECT(dialog), "ok-button", &ok_button, NULL); + g_signal_connect(G_OBJECT(ok_button), "clicked", G_CALLBACK(color_selection_dialog_destroy), gtkwb);
- gtk_color_selection_set_has_palette(GTK_COLOR_SELECTION(dialog->colorsel), TRUE);
+ gtk_color_selection_set_has_palette(GTK_COLOR_SELECTION(gtk_color_selection_dialog_get_color_selection(dialog)), TRUE); pidgin_whiteboard_rgb24_to_rgb48(gtkwb->brush_color, &color);
- gtk_color_selection_set_current_color(GTK_COLOR_SELECTION(dialog->colorsel), &color);
+ gtk_color_selection_set_current_color( + GTK_COLOR_SELECTION(gtk_color_selection_dialog_get_color_selection(dialog)), &color); gtk_widget_show_all(GTK_WIDGET(dialog));
--- a/pidgin/plugins/xmppconsole.c Mon Nov 22 10:18:15 2010 +0000
+++ b/pidgin/plugins/xmppconsole.c Thu Nov 25 22:30:18 2010 +0000
@@ -274,7 +274,7 @@
- gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE);
+ /* TODO: how to set no separator for GtkDialog in gtk+ 3.0... */ gtk_dialog_set_default_response (GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT);
gtk_container_set_border_width(GTK_CONTAINER(dialog), 12);
#if GTK_CHECK_VERSION(2,14,0)
@@ -302,11 +302,11 @@
gtk_size_group_add_widget(sg, label);
gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
- type_combo = gtk_combo_box_new_text();
- gtk_combo_box_append_text(GTK_COMBO_BOX(type_combo), "get");
- gtk_combo_box_append_text(GTK_COMBO_BOX(type_combo), "set");
- gtk_combo_box_append_text(GTK_COMBO_BOX(type_combo), "result");
- gtk_combo_box_append_text(GTK_COMBO_BOX(type_combo), "error");
+ type_combo = gtk_combo_box_text_new(); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(type_combo), "get"); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(type_combo), "set"); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(type_combo), "result"); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(type_combo), "error"); gtk_combo_box_set_active(GTK_COMBO_BOX(type_combo), 0);
gtk_box_pack_start(GTK_BOX(hbox), type_combo, FALSE, FALSE, 0);
@@ -325,7 +325,7 @@
- gtk_combo_box_get_active_text(GTK_COMBO_BOX(type_combo)));
+ gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(type_combo))); buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(console->entry));
gtk_text_buffer_set_text(buffer, stanza, -1);
@@ -362,7 +362,9 @@
- gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE);
+ /* TODO: find a way to specify no separator for a dialog in gtk+ 3 */ + /*gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE);*/ gtk_dialog_set_default_response (GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT);
gtk_container_set_border_width(GTK_CONTAINER(dialog), 12);
#if GTK_CHECK_VERSION(2,14,0)
@@ -389,15 +391,15 @@
gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
gtk_size_group_add_widget(sg, label);
gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
- type_combo = gtk_combo_box_new_text();
- gtk_combo_box_append_text(GTK_COMBO_BOX(type_combo), "default");
- gtk_combo_box_append_text(GTK_COMBO_BOX(type_combo), "unavailable");
- gtk_combo_box_append_text(GTK_COMBO_BOX(type_combo), "subscribe");
- gtk_combo_box_append_text(GTK_COMBO_BOX(type_combo), "unsubscribe");
- gtk_combo_box_append_text(GTK_COMBO_BOX(type_combo), "subscribed");
- gtk_combo_box_append_text(GTK_COMBO_BOX(type_combo), "unsubscribed");
- gtk_combo_box_append_text(GTK_COMBO_BOX(type_combo), "probe");
- gtk_combo_box_append_text(GTK_COMBO_BOX(type_combo), "error");
+ type_combo = gtk_combo_box_text_new(); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(type_combo), "default"); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(type_combo), "unavailable"); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(type_combo), "subscribe"); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(type_combo), "unsubscribe"); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(type_combo), "subscribed"); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(type_combo), "unsubscribed"); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(type_combo), "probe"); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(type_combo), "error"); gtk_combo_box_set_active(GTK_COMBO_BOX(type_combo), 0);
gtk_box_pack_start(GTK_BOX(hbox), type_combo, FALSE, FALSE, 0);
@@ -407,12 +409,12 @@
gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
gtk_size_group_add_widget(sg, label);
gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
- show_combo = gtk_combo_box_new_text();
- gtk_combo_box_append_text(GTK_COMBO_BOX(show_combo), "default");
- gtk_combo_box_append_text(GTK_COMBO_BOX(show_combo), "away");
- gtk_combo_box_append_text(GTK_COMBO_BOX(show_combo), "dnd");
- gtk_combo_box_append_text(GTK_COMBO_BOX(show_combo), "xa");
- gtk_combo_box_append_text(GTK_COMBO_BOX(show_combo), "chat");
+ show_combo = gtk_combo_box_text_new(); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(show_combo), "default"); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(show_combo), "away"); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(show_combo), "dnd"); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(show_combo), "xa"); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(show_combo), "chat"); gtk_combo_box_set_active(GTK_COMBO_BOX(show_combo), 0);
gtk_box_pack_start(GTK_BOX(hbox), show_combo, FALSE, FALSE, 0);
@@ -450,10 +452,10 @@
to = gtk_entry_get_text(GTK_ENTRY(to_entry));
- type = gtk_combo_box_get_active_text(GTK_COMBO_BOX(type_combo));
+ type = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(type_combo)); if (!strcmp(type, "default"))
- show = gtk_combo_box_get_active_text(GTK_COMBO_BOX(show_combo));
+ show = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(show_combo)); if (!strcmp(show, "default"))
status = gtk_entry_get_text(GTK_ENTRY(status_entry));
@@ -520,7 +522,8 @@
- gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE);
+ /* TODO: find a way to create a dialog without separtor in gtk+ 3 */ + /*gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE);*/ gtk_dialog_set_default_response (GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT);
gtk_container_set_border_width(GTK_CONTAINER(dialog), 12);
#if GTK_CHECK_VERSION(2,14,0)
@@ -547,12 +550,12 @@
gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
gtk_size_group_add_widget(sg, label);
gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
- type_combo = gtk_combo_box_new_text();
- gtk_combo_box_append_text(GTK_COMBO_BOX(type_combo), "chat");
- gtk_combo_box_append_text(GTK_COMBO_BOX(type_combo), "headline");
- gtk_combo_box_append_text(GTK_COMBO_BOX(type_combo), "groupchat");
- gtk_combo_box_append_text(GTK_COMBO_BOX(type_combo), "normal");
- gtk_combo_box_append_text(GTK_COMBO_BOX(type_combo), "error");
+ type_combo = gtk_combo_box_text_new(); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(type_combo), "chat"); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(type_combo), "headline"); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(type_combo), "groupchat"); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(type_combo), "normal"); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(type_combo), "error"); gtk_combo_box_set_active(GTK_COMBO_BOX(type_combo), 0);
gtk_box_pack_start(GTK_BOX(hbox), type_combo, FALSE, FALSE, 0);
@@ -613,7 +616,8 @@
- gtk_combo_box_get_active_text(GTK_COMBO_BOX(type_combo)),
+ gtk_combo_box_text_get_active_text( + GTK_COMBO_BOX_TEXT(type_combo)), @@ -643,7 +647,8 @@
- gtk_combo_box_append_text(GTK_COMBO_BOX(console->dropdown), purple_account_get_username(gc->account));
+ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(console->dropdown), + purple_account_get_username(gc->account)); console->accounts = g_list_append(console->accounts, gc);
@@ -674,7 +679,7 @@
- gtk_combo_box_remove_text(GTK_COMBO_BOX(console->dropdown), i);
+ gtk_combo_box_text_remove(GTK_COMBO_BOX_TEXT(console->dropdown), i); console->accounts = g_list_remove(console->accounts, gc);
@@ -716,7 +721,7 @@
-console_destroy(GtkObject *window, gpointer nul)
+console_destroy(GtkWidget *window, gpointer nul) g_list_free(console->accounts);
@@ -731,8 +736,9 @@
- account = purple_accounts_find(gtk_combo_box_get_active_text(GTK_COMBO_BOX(console->dropdown)),
+ purple_accounts_find(gtk_combo_box_text_get_active_text( + GTK_COMBO_BOX_TEXT(console->dropdown)), "prpl-jabber"); if (!account || !account->gc)
@@ -768,13 +774,13 @@
label = gtk_label_new(_("Account: "));
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
gtk_box_pack_start(GTK_BOX(console->hbox), label, FALSE, FALSE, 0);
- console->dropdown = gtk_combo_box_new_text();
+ console->dropdown = gtk_combo_box_text_new(); for (connections = purple_connections_get_all(); connections; connections = connections->next) {
PurpleConnection *gc = connections->data;
if (!strcmp(purple_account_get_protocol_id(purple_connection_get_account(gc)), "prpl-jabber")) {
console->accounts = g_list_append(console->accounts, gc);
- gtk_combo_box_append_text(GTK_COMBO_BOX(console->dropdown),
+ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(console->dropdown), purple_account_get_username(purple_connection_get_account(gc)));