Mercurial > pidgin.yaz
changeset 15821:cebfc6af3eb5
More Gaim to Pidgin stuff
| author | Sean Egan <seanegan@gmail.com> |
|---|---|
| date | Mon, 19 Mar 2007 06:01:29 +0000 |
| parents | c02a897a67c7 |
| children | 84b0f9b23ede |
| files | pidgin/gtkaccount.c pidgin/gtkblist.c pidgin/gtkconv.c pidgin/gtkconv.h pidgin/gtkconvwin.h pidgin/gtkdebug.c pidgin/gtkdialogs.c pidgin/gtkdnd-hints.h pidgin/gtkdocklet.c pidgin/gtkft.c pidgin/gtklog.c pidgin/gtknotify.c pidgin/gtkplugin.c pidgin/gtkpluginpref.c pidgin/gtkpounce.c pidgin/gtkprefs.c pidgin/gtkprivacy.c pidgin/gtkrequest.c pidgin/gtkroomlist.c pidgin/gtksavedstatuses.c pidgin/gtkstatusbox.c pidgin/gtkutils.c pidgin/gtkwhiteboard.c pidgin/pidgin.h pidgin/plugins/convcolors.c pidgin/plugins/gaimrc.c pidgin/plugins/spellchk.c |
| diffstat | 27 files changed, 312 insertions(+), 312 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/gtkaccount.c Sun Mar 18 21:12:40 2007 +0000 +++ b/pidgin/gtkaccount.c Mon Mar 19 06:01:29 2007 +0000 @@ -177,7 +177,7 @@ GtkWidget *hbox; GtkWidget *label; - hbox = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE); + hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); gtk_box_pack_start(GTK_BOX(parent), hbox, FALSE, FALSE, 0); gtk_widget_show(hbox); @@ -187,7 +187,7 @@ gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); gtk_widget_show(label); - gtk_box_pack_start(GTK_BOX(hbox), widget, TRUE, TRUE, GAIM_HIG_BORDER); + gtk_box_pack_start(GTK_BOX(hbox), widget, TRUE, TRUE, PIDGIN_HIG_BORDER); gtk_widget_show(widget); pidgin_set_accessible_label (widget, label); @@ -396,7 +396,7 @@ gtk_widget_show(dialog->login_frame); /* Main vbox */ - vbox = gtk_vbox_new(FALSE, GAIM_HIG_BOX_SPACE); + vbox = gtk_vbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); gtk_container_add(GTK_CONTAINER(frame), vbox); gtk_widget_show(vbox); @@ -483,7 +483,7 @@ dialog->password_entry = gtk_entry_new(); gtk_entry_set_visibility(GTK_ENTRY(dialog->password_entry), FALSE); if (gtk_entry_get_invisible_char(GTK_ENTRY(dialog->password_entry)) == '*') - gtk_entry_set_invisible_char(GTK_ENTRY(dialog->password_entry), GAIM_INVISIBLE_CHAR); + gtk_entry_set_invisible_char(GTK_ENTRY(dialog->password_entry), PIDGIN_INVISIBLE_CHAR); dialog->password_box = add_pref_box(dialog, vbox, _("Password:"), dialog->password_entry); @@ -558,7 +558,7 @@ gtk_widget_show(dialog->user_frame); /* Main vbox */ - vbox = gtk_vbox_new(FALSE, GAIM_HIG_BOX_SPACE); + vbox = gtk_vbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); gtk_container_add(GTK_CONTAINER(frame), vbox); gtk_widget_show(vbox); @@ -574,7 +574,7 @@ gtk_widget_show(dialog->icon_check); gtk_box_pack_start(GTK_BOX(vbox), dialog->icon_check, FALSE, FALSE, 0); - dialog->icon_hbox = hbox = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE); + dialog->icon_hbox = hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); gtk_widget_set_sensitive(hbox, gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(dialog->icon_check))); gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); gtk_widget_show(hbox); @@ -601,8 +601,8 @@ gtk_box_pack_start(GTK_BOX(hbox), vbox2, TRUE, TRUE, 0); gtk_widget_show(vbox2); - hbox2 = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE); - gtk_box_pack_start(GTK_BOX(vbox2), hbox2, FALSE, FALSE, GAIM_HIG_BORDER); + hbox2 = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); + gtk_box_pack_start(GTK_BOX(vbox2), hbox2, FALSE, FALSE, PIDGIN_HIG_BORDER); gtk_widget_show(hbox2); button = gtk_button_new_from_stock(GTK_STOCK_REMOVE); @@ -691,7 +691,7 @@ gtk_widget_show(dialog->protocol_frame); /* Main vbox */ - vbox = gtk_vbox_new(FALSE, GAIM_HIG_BOX_SPACE); + vbox = gtk_vbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); gtk_container_add(GTK_CONTAINER(frame), vbox); gtk_widget_show(vbox); @@ -779,7 +779,7 @@ { gtk_entry_set_visibility(GTK_ENTRY(entry), FALSE); if (gtk_entry_get_invisible_char(GTK_ENTRY(entry)) == '*') - gtk_entry_set_invisible_char(GTK_ENTRY(entry), GAIM_INVISIBLE_CHAR); + gtk_entry_set_invisible_char(GTK_ENTRY(entry), PIDGIN_INVISIBLE_CHAR); } if (str_value != NULL) @@ -979,7 +979,7 @@ gtk_widget_show(dialog->proxy_frame); /* Main vbox */ - vbox = gtk_vbox_new(FALSE, GAIM_HIG_BOX_SPACE); + vbox = gtk_vbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); gtk_container_add(GTK_CONTAINER(frame), vbox); gtk_widget_show(vbox); @@ -989,8 +989,8 @@ add_pref_box(dialog, vbox, _("Proxy _type:"), dialog->proxy_dropdown); /* Setup the second vbox, which may be hidden at times. */ - dialog->proxy_vbox = vbox2 = gtk_vbox_new(FALSE, GAIM_HIG_BOX_SPACE); - gtk_box_pack_start(GTK_BOX(vbox), vbox2, FALSE, FALSE, GAIM_HIG_BORDER); + dialog->proxy_vbox = vbox2 = gtk_vbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); + gtk_box_pack_start(GTK_BOX(vbox), vbox2, FALSE, FALSE, PIDGIN_HIG_BORDER); gtk_widget_show(vbox2); /* Host */ @@ -1013,7 +1013,7 @@ dialog->proxy_pass_entry = gtk_entry_new(); gtk_entry_set_visibility(GTK_ENTRY(dialog->proxy_pass_entry), FALSE); if (gtk_entry_get_invisible_char(GTK_ENTRY(dialog->proxy_pass_entry)) == '*') - gtk_entry_set_invisible_char(GTK_ENTRY(dialog->proxy_pass_entry), GAIM_INVISIBLE_CHAR); + gtk_entry_set_invisible_char(GTK_ENTRY(dialog->proxy_pass_entry), PIDGIN_INVISIBLE_CHAR); add_pref_box(dialog, vbox2, _("Pa_ssword:"), dialog->proxy_pass_entry); if (dialog->account != NULL && @@ -1431,13 +1431,13 @@ gtk_window_set_resizable(GTK_WINDOW(win), FALSE); - gtk_container_set_border_width(GTK_CONTAINER(win), GAIM_HIG_BORDER); + gtk_container_set_border_width(GTK_CONTAINER(win), PIDGIN_HIG_BORDER); g_signal_connect(G_OBJECT(win), "delete_event", G_CALLBACK(account_win_destroy_cb), dialog); /* Setup the vbox */ - main_vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER); + main_vbox = gtk_vbox_new(FALSE, PIDGIN_HIG_BORDER); gtk_container_add(GTK_CONTAINER(win), main_vbox); gtk_widget_show(main_vbox); @@ -1446,8 +1446,8 @@ gtk_widget_show(GTK_WIDGET(notebook)); /* Setup the inner vbox */ - dialog->top_vbox = vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER); - gtk_container_set_border_width(GTK_CONTAINER(vbox), GAIM_HIG_BORDER); + dialog->top_vbox = vbox = gtk_vbox_new(FALSE, PIDGIN_HIG_BORDER); + gtk_container_set_border_width(GTK_CONTAINER(vbox), PIDGIN_HIG_BORDER); gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbox, gtk_label_new_with_mnemonic(_("_Basic"))); gtk_widget_show(vbox); @@ -1457,8 +1457,8 @@ add_user_options(dialog, vbox); /* Setup the page with 'Advanced'. */ - dialog->bottom_vbox = dbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER); - gtk_container_set_border_width(GTK_CONTAINER(dbox), GAIM_HIG_BORDER); + dialog->bottom_vbox = dbox = gtk_vbox_new(FALSE, PIDGIN_HIG_BORDER); + gtk_container_set_border_width(GTK_CONTAINER(dbox), PIDGIN_HIG_BORDER); gtk_notebook_append_page(GTK_NOTEBOOK(notebook), dbox, gtk_label_new_with_mnemonic(_("_Advanced"))); gtk_widget_show(dbox); @@ -1469,7 +1469,7 @@ /* Setup the button box */ bbox = gtk_hbutton_box_new(); - gtk_box_set_spacing(GTK_BOX(bbox), GAIM_HIG_BOX_SPACE); + gtk_box_set_spacing(GTK_BOX(bbox), PIDGIN_HIG_BOX_SPACE); gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END); gtk_box_pack_end(GTK_BOX(main_vbox), bbox, FALSE, TRUE, 0); gtk_widget_show(bbox); @@ -2268,7 +2268,7 @@ gtk_window_set_default_size(GTK_WINDOW(win), width, height); gtk_window_set_role(GTK_WINDOW(win), "accounts"); gtk_window_set_title(GTK_WINDOW(win), _("Accounts")); - gtk_container_set_border_width(GTK_CONTAINER(win), GAIM_HIG_BORDER); + gtk_container_set_border_width(GTK_CONTAINER(win), PIDGIN_HIG_BORDER); g_signal_connect(G_OBJECT(win), "delete_event", G_CALLBACK(accedit_win_destroy_cb), accounts_window); @@ -2276,7 +2276,7 @@ G_CALLBACK(configure_cb), accounts_window); /* Setup the vbox */ - vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER); + vbox = gtk_vbox_new(FALSE, PIDGIN_HIG_BORDER); gtk_container_add(GTK_CONTAINER(win), vbox); gtk_widget_show(vbox); @@ -2287,7 +2287,7 @@ /* Button box. */ bbox = gtk_hbutton_box_new(); - gtk_box_set_spacing(GTK_BOX(bbox), GAIM_HIG_BOX_SPACE); + gtk_box_set_spacing(GTK_BOX(bbox), PIDGIN_HIG_BOX_SPACE); gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END); gtk_box_pack_end(GTK_BOX(vbox), bbox, FALSE, TRUE, 0); gtk_widget_show(bbox);
--- a/pidgin/gtkblist.c Sun Mar 18 21:12:40 2007 +0000 +++ b/pidgin/gtkblist.c Mon Mar 19 06:01:29 2007 +0000 @@ -128,12 +128,12 @@ static void pidgin_blist_update(GaimBuddyList *list, GaimBlistNode *node); static void pidgin_blist_update_group(GaimBuddyList *list, GaimBlistNode *node); static void pidgin_blist_update_contact(GaimBuddyList *list, GaimBlistNode *node); -static char *gaim_get_tooltip_text(GaimBlistNode *node, gboolean full); +static char *pidgin_get_tooltip_text(GaimBlistNode *node, gboolean full); static const char *item_factory_translate_func (const char *path, gpointer func_data); static gboolean get_iter_from_node(GaimBlistNode *node, GtkTreeIter *iter); static void redo_buddy_list(GaimBuddyList *list, gboolean remove, gboolean rerender); static void pidgin_blist_collapse_contact_cb(GtkWidget *w, GaimBlistNode *node); -static char *gaim_get_group_title(GaimBlistNode *gnode, gboolean expanded); +static char *pidgin_get_group_title(GaimBlistNode *gnode, gboolean expanded); static void pidgin_blist_tooltip_destroy(void); @@ -590,7 +590,7 @@ pce = tmp->data; - rowbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER); + rowbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BORDER); gtk_box_pack_start(GTK_BOX(data->entries_box), rowbox, FALSE, FALSE, 0); label = gtk_label_new_with_mnemonic(pce->label); @@ -619,7 +619,7 @@ { gtk_entry_set_visibility(GTK_ENTRY(input), FALSE); if (gtk_entry_get_invisible_char(GTK_ENTRY(input)) == '*') - gtk_entry_set_invisible_char(GTK_ENTRY(input), GAIM_INVISIBLE_CHAR); + gtk_entry_set_invisible_char(GTK_ENTRY(input), PIDGIN_INVISIBLE_CHAR); } gtk_box_pack_end(GTK_BOX(rowbox), input, TRUE, TRUE, 0); g_signal_connect(G_OBJECT(input), "changed", @@ -706,14 +706,14 @@ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, PIDGIN_STOCK_CHAT, GTK_RESPONSE_OK, NULL); gtk_dialog_set_default_response(GTK_DIALOG(data->window), GTK_RESPONSE_OK); - gtk_container_set_border_width(GTK_CONTAINER(data->window), GAIM_HIG_BOX_SPACE); + 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), GAIM_HIG_BORDER); + 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), GAIM_HIG_BOX_SPACE); + GTK_CONTAINER(GTK_DIALOG(data->window)->vbox), PIDGIN_HIG_BOX_SPACE); gtk_window_set_role(GTK_WINDOW(data->window), "join_chat"); - hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER); + hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BORDER); gtk_container_add(GTK_CONTAINER(GTK_DIALOG(data->window)->vbox), hbox); gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0); gtk_misc_set_alignment(GTK_MISC(img), 0, 0); @@ -728,7 +728,7 @@ gtk_misc_set_alignment(GTK_MISC(label), 0, 0); gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0); - rowbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER); + rowbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BORDER); gtk_box_pack_start(GTK_BOX(vbox), rowbox, TRUE, TRUE, 0); data->sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); @@ -774,7 +774,7 @@ if (GAIM_BLIST_NODE_IS_GROUP(node)) { char *title; - title = gaim_get_group_title(node, TRUE); + title = pidgin_get_group_title(node, TRUE); gtk_tree_store_set(gtkblist->treemodel, iter, NAME_COLUMN, title, @@ -798,7 +798,7 @@ if (GAIM_BLIST_NODE_IS_GROUP(node)) { char *title; - title = gaim_get_group_title(node, FALSE); + title = pidgin_get_group_title(node, FALSE); gtk_tree_store_set(gtkblist->treemodel, iter, NAME_COLUMN, title, @@ -2270,7 +2270,7 @@ td->status_icon = pidgin_blist_get_status_icon(node, PIDGIN_STATUS_ICON_LARGE); td->avatar = pidgin_blist_get_buddy_icon(node, !full, FALSE, TRUE); td->prpl_icon = pidgin_create_prpl_icon(account, PIDGIN_PRPL_ICON_SMALL); - tooltip_text = gaim_get_tooltip_text(node, full); + tooltip_text = pidgin_get_tooltip_text(node, full); td->layout = gtk_widget_create_pango_layout(gtkblist->tipwindow, NULL); td->name_layout = gtk_widget_create_pango_layout(gtkblist->tipwindow, NULL); @@ -2799,7 +2799,7 @@ * Private Utility functions * *********************************************************/ -static char *gaim_get_tooltip_text(GaimBlistNode *node, gboolean full) +static char *pidgin_get_tooltip_text(GaimBlistNode *node, gboolean full) { GString *str = g_string_new(""); GaimPlugin *prpl; @@ -3925,7 +3925,7 @@ g_object_unref(pixbuf); gtk_box_pack_start(GTK_BOX(hbox), image, FALSE, FALSE, - GAIM_HIG_BOX_SPACE); + PIDGIN_HIG_BOX_SPACE); } } @@ -3937,7 +3937,7 @@ g_object_set(label, "ellipsize", PANGO_ELLIPSIZE_END, NULL); #endif gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, - GAIM_HIG_BOX_SPACE); + PIDGIN_HIG_BOX_SPACE); /* Create the actual button and put the icon and text on it */ button = gtk_button_new(); @@ -4052,7 +4052,7 @@ static GtkWidget * kiosk_page() { - GtkWidget *ret = gtk_vbox_new(FALSE, GAIM_HIG_BOX_SPACE); + GtkWidget *ret = gtk_vbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); GtkWidget *label; GtkWidget *entry; GtkWidget *bbox; @@ -4088,7 +4088,7 @@ label = gtk_label_new(NULL); gtk_box_pack_start(GTK_BOX(ret), label, TRUE, TRUE, 0); - gtk_container_set_border_width(GTK_CONTAINER(ret), GAIM_HIG_BORDER); + gtk_container_set_border_width(GTK_CONTAINER(ret), PIDGIN_HIG_BORDER); gtk_widget_show_all(ret); return ret; @@ -4754,7 +4754,7 @@ expanded = gtk_tree_view_row_expanded(GTK_TREE_VIEW(gtkblist->treeview), path); gtk_tree_path_free(path); - title = gaim_get_group_title(gnode, expanded); + title = pidgin_get_group_title(gnode, expanded); gtk_tree_store_set(gtkblist->treemodel, &iter, STATUS_ICON_VISIBLE_COLUMN, FALSE, @@ -4774,7 +4774,7 @@ } } -static char *gaim_get_group_title(GaimBlistNode *gnode, gboolean expanded) +static char *pidgin_get_group_title(GaimBlistNode *gnode, gboolean expanded) { GaimGroup *group; GdkColor textcolor; @@ -5248,15 +5248,15 @@ NULL); gtk_dialog_set_default_response(GTK_DIALOG(data->window), GTK_RESPONSE_OK); - gtk_container_set_border_width(GTK_CONTAINER(data->window), GAIM_HIG_BOX_SPACE); + 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), GAIM_HIG_BORDER); - gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(data->window)->vbox), GAIM_HIG_BOX_SPACE); + 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_window_set_role(GTK_WINDOW(data->window), "add_buddy"); gtk_window_set_type_hint(GTK_WINDOW(data->window), GDK_WINDOW_TYPE_HINT_DIALOG); - hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER); + hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BORDER); gtk_container_add(GTK_CONTAINER(GTK_DIALOG(data->window)->vbox), hbox); gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0); gtk_misc_set_alignment(GTK_MISC(img), 0, 0); @@ -5275,7 +5275,7 @@ gtk_misc_set_alignment(GTK_MISC(label), 0, 0); gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0); - hbox = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE); + hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); gtk_container_add(GTK_CONTAINER(vbox), hbox); g_signal_connect(G_OBJECT(data->window), "destroy", @@ -5518,7 +5518,7 @@ { gtk_entry_set_visibility(GTK_ENTRY(input), FALSE); if (gtk_entry_get_invisible_char(GTK_ENTRY(input)) == '*') - gtk_entry_set_invisible_char(GTK_ENTRY(input), GAIM_INVISIBLE_CHAR); + gtk_entry_set_invisible_char(GTK_ENTRY(input), PIDGIN_INVISIBLE_CHAR); } gtk_box_pack_end(GTK_BOX(rowbox), input, TRUE, TRUE, 0); g_signal_connect(G_OBJECT(input), "changed", @@ -5624,15 +5624,15 @@ NULL); gtk_dialog_set_default_response(GTK_DIALOG(data->window), GTK_RESPONSE_OK); - gtk_container_set_border_width(GTK_CONTAINER(data->window), GAIM_HIG_BOX_SPACE); + 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), GAIM_HIG_BORDER); - gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(data->window)->vbox), GAIM_HIG_BOX_SPACE); + 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_window_set_role(GTK_WINDOW(data->window), "add_chat"); gtk_window_set_type_hint(GTK_WINDOW(data->window), GDK_WINDOW_TYPE_HINT_DIALOG); - hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER); + hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BORDER); gtk_container_add(GTK_CONTAINER(GTK_DIALOG(data->window)->vbox), hbox); gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0); gtk_misc_set_alignment(GTK_MISC(img), 0, 0);
--- a/pidgin/gtkconv.c Sun Mar 18 21:12:40 2007 +0000 +++ b/pidgin/gtkconv.c Mon Mar 19 06:01:29 2007 +0000 @@ -166,7 +166,7 @@ static void add_chat_buddy_common(GaimConversation *conv, GaimConvChatBuddy *cb, const char *old_name); static gboolean tab_complete(GaimConversation *conv); static void pidgin_conv_updated(GaimConversation *conv, GaimConvUpdateType type); -static void gtkconv_set_unseen(PidginConversation *gtkconv, GaimUnseenState state); +static void gtkconv_set_unseen(PidginConversation *gtkconv, PidginUnseenState state); static void update_typing_icon(PidginConversation *gtkconv); static const char *item_factory_translate_func (const char *path, gpointer func_data); gboolean pidgin_conv_has_focus(GaimConversation *conv); @@ -859,7 +859,7 @@ gtk_dialog_set_default_response(GTK_DIALOG(invite_dialog), GTK_RESPONSE_OK); - gtk_container_set_border_width(GTK_CONTAINER(invite_dialog), GAIM_HIG_BOX_SPACE); + gtk_container_set_border_width(GTK_CONTAINER(invite_dialog), PIDGIN_HIG_BOX_SPACE); gtk_window_set_resizable(GTK_WINDOW(invite_dialog), FALSE); gtk_dialog_set_has_separator(GTK_DIALOG(invite_dialog), FALSE); @@ -868,11 +868,11 @@ /* Setup the outside spacing. */ vbox = GTK_DIALOG(invite_dialog)->vbox; - gtk_box_set_spacing(GTK_BOX(vbox), GAIM_HIG_BORDER); - gtk_container_set_border_width(GTK_CONTAINER(vbox), GAIM_HIG_BOX_SPACE); + gtk_box_set_spacing(GTK_BOX(vbox), PIDGIN_HIG_BORDER); + gtk_container_set_border_width(GTK_CONTAINER(vbox), PIDGIN_HIG_BOX_SPACE); /* Setup the inner hbox and put the dialog's icon in it. */ - hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER); + hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BORDER); gtk_container_add(GTK_CONTAINER(vbox), hbox); gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0); gtk_misc_set_alignment(GTK_MISC(img), 0, 0); @@ -891,14 +891,14 @@ gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0); /* hbox for the table, and to give it some spacing on the left. */ - hbox = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE); + hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); gtk_container_add(GTK_CONTAINER(vbox), hbox); /* Setup the table we're going to use to lay stuff out. */ table = gtk_table_new(2, 2, FALSE); - gtk_table_set_row_spacings(GTK_TABLE(table), GAIM_HIG_BOX_SPACE); - gtk_table_set_col_spacings(GTK_TABLE(table), GAIM_HIG_BOX_SPACE); - gtk_container_set_border_width(GTK_CONTAINER(table), GAIM_HIG_BORDER); + gtk_table_set_row_spacings(GTK_TABLE(table), PIDGIN_HIG_BOX_SPACE); + gtk_table_set_col_spacings(GTK_TABLE(table), PIDGIN_HIG_BOX_SPACE); + gtk_container_set_border_width(GTK_CONTAINER(table), PIDGIN_HIG_BORDER); gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, 0); /* Now the Buddy label */ @@ -1166,14 +1166,14 @@ g_signal_connect(G_OBJECT(gtkwin->dialogs.search), "response", G_CALLBACK(do_search_cb), s); - gtk_container_set_border_width(GTK_CONTAINER(gtkwin->dialogs.search), GAIM_HIG_BOX_SPACE); + gtk_container_set_border_width(GTK_CONTAINER(gtkwin->dialogs.search), PIDGIN_HIG_BOX_SPACE); gtk_window_set_resizable(GTK_WINDOW(gtkwin->dialogs.search), FALSE); gtk_dialog_set_has_separator(GTK_DIALOG(gtkwin->dialogs.search), FALSE); - gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(gtkwin->dialogs.search)->vbox), GAIM_HIG_BORDER); + gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(gtkwin->dialogs.search)->vbox), PIDGIN_HIG_BORDER); gtk_container_set_border_width( - GTK_CONTAINER(GTK_DIALOG(gtkwin->dialogs.search)->vbox), GAIM_HIG_BOX_SPACE); - - hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER); + GTK_CONTAINER(GTK_DIALOG(gtkwin->dialogs.search)->vbox), PIDGIN_HIG_BOX_SPACE); + + hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BORDER); gtk_container_add(GTK_CONTAINER(GTK_DIALOG(gtkwin->dialogs.search)->vbox), hbox); gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0); @@ -2685,7 +2685,7 @@ GList * pidgin_conversations_find_unseen_list(GaimConversationType type, - GaimUnseenState min_state, + PidginUnseenState min_state, gboolean hidden_only, guint max_count) { @@ -4103,10 +4103,10 @@ height += (oneline.height + pad_inside) * (wrapped_lines - lines); gtk_widget_size_request(gtkconv->lower_hbox, &sr); - if (sr.height < height + GAIM_HIG_BOX_SPACE) { + if (sr.height < height + PIDGIN_HIG_BOX_SPACE) { gtkconv->auto_resize = TRUE; gtkconv->entry_growing = TRUE; - gtk_widget_set_size_request(gtkconv->lower_hbox, -1, height + GAIM_HIG_BOX_SPACE); + gtk_widget_set_size_request(gtkconv->lower_hbox, -1, height + PIDGIN_HIG_BOX_SPACE); g_idle_add(reset_auto_resize_cb, gtkconv); } } @@ -4143,13 +4143,13 @@ gtk_widget_show(vpaned); /* Setup the top part of the pane. */ - vbox = gtk_vbox_new(FALSE, GAIM_HIG_BOX_SPACE); + vbox = gtk_vbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); gtk_paned_pack1(GTK_PANED(vpaned), vbox, TRUE, TRUE); gtk_widget_show(vbox); if (prpl_info->options & OPT_PROTO_CHAT_TOPIC) { - hbox = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE); + hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); gtk_widget_show(hbox); @@ -4200,7 +4200,7 @@ G_CALLBACK(refocus_entry_cb), gtkconv); /* Build the right pane. */ - lbox = gtk_vbox_new(FALSE, GAIM_HIG_BOX_SPACE); + lbox = gtk_vbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); gtk_paned_pack2(GTK_PANED(hpaned), lbox, FALSE, TRUE); gtk_widget_show(lbox); @@ -4275,15 +4275,15 @@ gtk_container_add(GTK_CONTAINER(sw), list); /* Setup the bottom half of the conversation window */ - vbox = gtk_vbox_new(FALSE, GAIM_HIG_BOX_SPACE); + vbox = gtk_vbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); gtk_paned_pack2(GTK_PANED(vpaned), vbox, FALSE, TRUE); gtk_widget_show(vbox); - gtkconv->lower_hbox = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE); + gtkconv->lower_hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); gtk_box_pack_start(GTK_BOX(vbox), gtkconv->lower_hbox, TRUE, TRUE, 0); gtk_widget_show(gtkconv->lower_hbox); - vbox = gtk_vbox_new(FALSE, GAIM_HIG_BOX_SPACE); + vbox = gtk_vbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); gtk_box_pack_end(GTK_BOX(gtkconv->lower_hbox), vbox, TRUE, TRUE, 0); gtk_widget_show(vbox); @@ -4345,7 +4345,7 @@ gtk_widget_show(paned); /* Setup the top part of the pane */ - vbox = gtk_vbox_new(FALSE, GAIM_HIG_BOX_SPACE); + vbox = gtk_vbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); gtk_paned_pack1(GTK_PANED(paned), vbox, TRUE, TRUE); gtk_widget_show(vbox); @@ -4374,15 +4374,15 @@ G_CALLBACK(refocus_entry_cb), gtkconv); /* Setup the bottom half of the conversation window */ - vbox2 = gtk_vbox_new(FALSE, GAIM_HIG_BOX_SPACE); + vbox2 = gtk_vbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); gtk_paned_pack2(GTK_PANED(paned), vbox2, FALSE, TRUE); gtk_widget_show(vbox2); - gtkconv->lower_hbox = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE); + gtkconv->lower_hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); gtk_box_pack_start(GTK_BOX(vbox2), gtkconv->lower_hbox, TRUE, TRUE, 0); gtk_widget_show(gtkconv->lower_hbox); - vbox2 = gtk_vbox_new(FALSE, GAIM_HIG_BOX_SPACE); + vbox2 = gtk_vbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); gtk_box_pack_end(GTK_BOX(gtkconv->lower_hbox), vbox2, TRUE, TRUE, 0); gtk_widget_show(vbox2); @@ -4669,9 +4669,9 @@ G_CALLBACK(conv_dnd_recv), gtkconv); /* Setup the container for the tab. */ - gtkconv->tab_cont = tab_cont = gtk_vbox_new(FALSE, GAIM_HIG_BOX_SPACE); + gtkconv->tab_cont = tab_cont = gtk_vbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); g_object_set_data(G_OBJECT(tab_cont), "PidginConversation", gtkconv); - gtk_container_set_border_width(GTK_CONTAINER(tab_cont), GAIM_HIG_BOX_SPACE); + gtk_container_set_border_width(GTK_CONTAINER(tab_cont), PIDGIN_HIG_BOX_SPACE); gtk_container_add(GTK_CONTAINER(tab_cont), pane); gtk_widget_show(pane); @@ -5256,7 +5256,7 @@ /* Tab highlighting stuff */ if (!(flags & GAIM_MESSAGE_SEND) && !pidgin_conv_has_focus(conv)) { - GaimUnseenState unseen = PIDGIN_UNSEEN_NONE; + PidginUnseenState unseen = PIDGIN_UNSEEN_NONE; if ((flags & GAIM_MESSAGE_NICK) == GAIM_MESSAGE_NICK) unseen = PIDGIN_UNSEEN_NICK; @@ -6325,8 +6325,8 @@ continue; if (horiz) { - if (x_rel >= tab->allocation.x - GAIM_HIG_BOX_SPACE && - x_rel <= tab->allocation.x + tab->allocation.width + GAIM_HIG_BOX_SPACE) { + if (x_rel >= tab->allocation.x - PIDGIN_HIG_BOX_SPACE && + x_rel <= tab->allocation.x + tab->allocation.width + PIDGIN_HIG_BOX_SPACE) { page_num = i; if (to_right && x_rel >= tab->allocation.x + tab->allocation.width/2) @@ -6335,8 +6335,8 @@ break; } } else { - if (y_rel >= tab->allocation.y - GAIM_HIG_BOX_SPACE && - y_rel <= tab->allocation.y + tab->allocation.height + GAIM_HIG_BOX_SPACE) { + if (y_rel >= tab->allocation.y - PIDGIN_HIG_BOX_SPACE && + y_rel <= tab->allocation.y + tab->allocation.height + PIDGIN_HIG_BOX_SPACE) { page_num = i; if (to_right && y_rel >= tab->allocation.y + tab->allocation.height/2) @@ -6605,7 +6605,7 @@ conv_placement_pref_cb(const char *name, GaimPrefType type, gconstpointer value, gpointer data) { - GaimConvPlacementFunc func; + PidginConvPlacementFunc func; if (strcmp(name, "/gaim/gtk/conversations/placement")) return; @@ -7189,7 +7189,7 @@ } static void -gtkconv_set_unseen(PidginConversation *gtkconv, GaimUnseenState state) +gtkconv_set_unseen(PidginConversation *gtkconv, PidginUnseenState state) { if (state == PIDGIN_UNSEEN_NONE) { @@ -7979,10 +7979,10 @@ angle = 270; if (angle) - gtkconv->tabby = tabby = gtk_vbox_new(FALSE, GAIM_HIG_BOX_SPACE); + gtkconv->tabby = tabby = gtk_vbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); else - gtkconv->tabby = tabby = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE); - gtkconv->menu_tabby = menu_tabby = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE); + gtkconv->tabby = tabby = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); + gtkconv->menu_tabby = menu_tabby = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); /* Close button. */ gtkconv->close = gtk_button_new(); @@ -8274,12 +8274,12 @@ { char *id; char *name; - GaimConvPlacementFunc fnc; + PidginConvPlacementFunc fnc; } ConvPlacementData; static GList *conv_placement_fncs = NULL; -static GaimConvPlacementFunc place_conv = NULL; +static PidginConvPlacementFunc place_conv = NULL; /* This one places conversations in the last made window. */ static void @@ -8451,7 +8451,7 @@ static void add_conv_placement_fnc(const char *id, const char *name, - GaimConvPlacementFunc fnc) + PidginConvPlacementFunc fnc) { ConvPlacementData *data; @@ -8501,7 +8501,7 @@ void pidgin_conv_placement_add_fnc(const char *id, const char *name, - GaimConvPlacementFunc fnc) + PidginConvPlacementFunc fnc) { g_return_if_fail(id != NULL); g_return_if_fail(name != NULL); @@ -8542,7 +8542,7 @@ return data->name; } -GaimConvPlacementFunc +PidginConvPlacementFunc pidgin_conv_placement_get_fnc(const char *id) { ConvPlacementData *data; @@ -8558,7 +8558,7 @@ } void -pidgin_conv_placement_set_current_func(GaimConvPlacementFunc func) +pidgin_conv_placement_set_current_func(PidginConvPlacementFunc func) { g_return_if_fail(func != NULL); @@ -8569,7 +8569,7 @@ place_conv = NULL; } -GaimConvPlacementFunc +PidginConvPlacementFunc pidgin_conv_placement_get_current_func(void) { return place_conv;
--- a/pidgin/gtkconv.h Sun Mar 18 21:12:40 2007 +0000 +++ b/pidgin/gtkconv.h Mon Mar 19 06:01:29 2007 +0000 @@ -39,7 +39,7 @@ PIDGIN_UNSEEN_NO_LOG, /**< Unseen text with NO_LOG flag. */ PIDGIN_UNSEEN_TEXT, /**< Unseen text in the conversation. */ PIDGIN_UNSEEN_NICK /**< Unseen text and the nick was said. */ -} GaimUnseenState; +} PidginUnseenState; enum { CHAT_USERS_ICON_COLUMN, @@ -147,7 +147,7 @@ GtkWidget *toolbar; - GaimUnseenState unseen_state; + PidginUnseenState unseen_state; guint unseen_count; union @@ -212,7 +212,7 @@ */ GList * pidgin_conversations_find_unseen_list(GaimConversationType type, - GaimUnseenState min_state, + PidginUnseenState min_state, gboolean hidden_only, guint max_count);
--- a/pidgin/gtkconvwin.h Sun Mar 18 21:12:40 2007 +0000 +++ b/pidgin/gtkconvwin.h Mon Mar 19 06:01:29 2007 +0000 @@ -132,15 +132,15 @@ **************************************************************************/ /*@{*/ -typedef void (*GaimConvPlacementFunc)(PidginConversation *); +typedef void (*PidginConvPlacementFunc)(PidginConversation *); GList *pidgin_conv_placement_get_options(void); -void pidgin_conv_placement_add_fnc(const char *id, const char *name, GaimConvPlacementFunc fnc); +void pidgin_conv_placement_add_fnc(const char *id, const char *name, PidginConvPlacementFunc fnc); void pidgin_conv_placement_remove_fnc(const char *id); const char *pidgin_conv_placement_get_name(const char *id); -GaimConvPlacementFunc pidgin_conv_placement_get_fnc(const char *id); -void pidgin_conv_placement_set_current_func(GaimConvPlacementFunc func); -GaimConvPlacementFunc pidgin_conv_placement_get_current_func(void); +PidginConvPlacementFunc pidgin_conv_placement_get_fnc(const char *id); +void pidgin_conv_placement_set_current_func(PidginConvPlacementFunc func); +PidginConvPlacementFunc pidgin_conv_placement_get_current_func(void); void pidgin_conv_placement_place(PidginConversation *gtkconv); /*@}*/
--- a/pidgin/gtkdebug.c Sun Mar 18 21:12:40 2007 +0000 +++ b/pidgin/gtkdebug.c Mon Mar 19 06:01:29 2007 +0000 @@ -172,14 +172,14 @@ g_signal_connect(G_OBJECT(win->find), "response", G_CALLBACK(do_find_cb), f); - gtk_container_set_border_width(GTK_CONTAINER(win->find), GAIM_HIG_BOX_SPACE); + gtk_container_set_border_width(GTK_CONTAINER(win->find), PIDGIN_HIG_BOX_SPACE); gtk_window_set_resizable(GTK_WINDOW(win->find), FALSE); gtk_dialog_set_has_separator(GTK_DIALOG(win->find), FALSE); - gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(win->find)->vbox), GAIM_HIG_BORDER); + gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(win->find)->vbox), PIDGIN_HIG_BORDER); gtk_container_set_border_width( - GTK_CONTAINER(GTK_DIALOG(win->find)->vbox), GAIM_HIG_BOX_SPACE); + GTK_CONTAINER(GTK_DIALOG(win->find)->vbox), PIDGIN_HIG_BOX_SPACE); - hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER); + hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BORDER); gtk_container_add(GTK_CONTAINER(GTK_DIALOG(win->find)->vbox), hbox); img = gtk_image_new_from_stock(PIDGIN_STOCK_DIALOG_QUESTION,
--- a/pidgin/gtkdialogs.c Sun Mar 18 21:12:40 2007 +0000 +++ b/pidgin/gtkdialogs.c Mon Mar 19 06:01:29 2007 +0000 @@ -43,7 +43,7 @@ static GtkWidget *about = NULL; -struct _GaimGroupMergeObject { +struct _PidginGroupMergeObject { GaimGroup* parent; char *new_name; }; @@ -321,11 +321,11 @@ gtk_window_set_resizable(GTK_WINDOW(about), TRUE); gtk_window_set_default_size(GTK_WINDOW(about), 340, 450); - hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER); - gtk_container_set_border_width(GTK_CONTAINER(hbox), GAIM_HIG_BORDER); + hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BORDER); + gtk_container_set_border_width(GTK_CONTAINER(hbox), PIDGIN_HIG_BORDER); gtk_container_add(GTK_CONTAINER(about), hbox); - vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER); + vbox = gtk_vbox_new(FALSE, PIDGIN_HIG_BORDER); gtk_container_add(GTK_CONTAINER(hbox), vbox); /* Generate a logo with a version number */ @@ -777,17 +777,17 @@ if (strlen(gtk_label_get_label(GTK_LABEL(label))) <= 0) return FALSE; - window = gtk_dialog_new_with_buttons(GAIM_ALERT_TITLE, NULL, 0, GTK_STOCK_CLOSE, GTK_RESPONSE_OK, NULL); + window = gtk_dialog_new_with_buttons(PIDGIN_ALERT_TITLE, NULL, 0, GTK_STOCK_CLOSE, GTK_RESPONSE_OK, NULL); gtk_dialog_set_default_response (GTK_DIALOG(window), GTK_RESPONSE_OK); g_signal_connect(G_OBJECT(window), "response", G_CALLBACK(gtk_widget_destroy), NULL); - gtk_container_set_border_width (GTK_CONTAINER(window), GAIM_HIG_BOX_SPACE); + gtk_container_set_border_width (GTK_CONTAINER(window), PIDGIN_HIG_BOX_SPACE); gtk_window_set_resizable(GTK_WINDOW(window), FALSE); gtk_dialog_set_has_separator(GTK_DIALOG(window), FALSE); - gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(window)->vbox), GAIM_HIG_BORDER); - gtk_container_set_border_width (GTK_CONTAINER(GTK_DIALOG(window)->vbox), GAIM_HIG_BOX_SPACE); + gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(window)->vbox), PIDGIN_HIG_BORDER); + gtk_container_set_border_width (GTK_CONTAINER(GTK_DIALOG(window)->vbox), PIDGIN_HIG_BOX_SPACE); - hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER); + hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BORDER); gtk_container_add(GTK_CONTAINER(GTK_DIALOG(window)->vbox), hbox); img = gtk_image_new_from_stock(PIDGIN_STOCK_DIALOG_COOL, gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_HUGE)); gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0); @@ -1054,14 +1054,14 @@ } } -static void free_ggmo(struct _GaimGroupMergeObject *ggp) +static void free_ggmo(struct _PidginGroupMergeObject *ggp) { g_free(ggp->new_name); g_free(ggp); } static void -pidgindialogs_merge_groups_cb(struct _GaimGroupMergeObject *GGP) +pidgindialogs_merge_groups_cb(struct _PidginGroupMergeObject *GGP) { gaim_blist_rename_group(GGP->parent, GGP->new_name); free_ggmo(GGP); @@ -1071,7 +1071,7 @@ pidgindialogs_merge_groups(GaimGroup *source, const char *new_name) { gchar *text; - struct _GaimGroupMergeObject *ggp; + struct _PidginGroupMergeObject *ggp; g_return_if_fail(source != NULL); g_return_if_fail(new_name != NULL); @@ -1080,7 +1080,7 @@ _("You are about to merge the group called %s into the group " "called %s. Do you want to continue?"), source->name, new_name); - ggp = g_new(struct _GaimGroupMergeObject, 1); + ggp = g_new(struct _PidginGroupMergeObject, 1); ggp->parent = source; ggp->new_name = g_strdup(new_name);
--- a/pidgin/gtkdnd-hints.h Sun Mar 18 21:12:40 2007 +0000 +++ b/pidgin/gtkdnd-hints.h Mon Mar 19 06:01:29 2007 +0000 @@ -20,8 +20,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _GAIM_DND_HINTS_H_ -#define _GAIM_DND_HINTS_H_ +#ifndef _PIDGIN_DND_HINTS_H_ +#define _PIDGIN_DND_HINTS_H_ #include <glib.h> #include <gtk/gtkwidget.h> @@ -83,4 +83,4 @@ void dnd_hints_show_relative(DndHintWindowId id, GtkWidget *widget, DndHintPosition horiz, DndHintPosition vert); -#endif /* _GAIM_DND_HINTS_H_ */ +#endif /* _PIDGIN_DND_HINTS_H_ */
--- a/pidgin/gtkdocklet.c Sun Mar 18 21:12:40 2007 +0000 +++ b/pidgin/gtkdocklet.c Mon Mar 19 06:01:29 2007 +0000 @@ -244,7 +244,7 @@ **************************************************************************/ #if 0 static void -gaim_quit_cb() +pidgin_quit_cb() { /* TODO: confirm quit while pending */ } @@ -409,7 +409,7 @@ } static GtkWidget * -new_menu_item_with_gaim_icon(GtkWidget *menu, const char *str, GaimStatusPrimitive primitive, GtkSignalFunc sf, gpointer data, guint accel_key, guint accel_mods, char *mod) +new_menu_item_with_status_icon(GtkWidget *menu, const char *str, GaimStatusPrimitive primitive, GtkSignalFunc sf, gpointer data, guint accel_key, guint accel_mods, char *mod) { GtkWidget *menuitem; GdkPixbuf *pixbuf; @@ -443,19 +443,19 @@ menuitem = gtk_menu_item_new_with_label(_("Change Status")); gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), submenu); - new_menu_item_with_gaim_icon(submenu, _("Available"), + new_menu_item_with_status_icon(submenu, _("Available"), GAIM_STATUS_AVAILABLE, G_CALLBACK(activate_status_primitive_cb), GINT_TO_POINTER(GAIM_STATUS_AVAILABLE), 0, 0, NULL); - new_menu_item_with_gaim_icon(submenu, _("Away"), + new_menu_item_with_status_icon(submenu, _("Away"), GAIM_STATUS_AWAY, G_CALLBACK(activate_status_primitive_cb), GINT_TO_POINTER(GAIM_STATUS_AWAY), 0, 0, NULL); - new_menu_item_with_gaim_icon(submenu, _("Invisible"), + new_menu_item_with_status_icon(submenu, _("Invisible"), GAIM_STATUS_INVISIBLE, G_CALLBACK(activate_status_primitive_cb), GINT_TO_POINTER(GAIM_STATUS_INVISIBLE), 0, 0, NULL); - new_menu_item_with_gaim_icon(submenu, _("Offline"), + new_menu_item_with_status_icon(submenu, _("Offline"), GAIM_STATUS_OFFLINE, G_CALLBACK(activate_status_primitive_cb), GINT_TO_POINTER(GAIM_STATUS_OFFLINE), 0, 0, NULL); @@ -466,7 +466,7 @@ { GaimSavedStatus *saved_status = cur->data; time_t creation_time = gaim_savedstatus_get_creation_time(saved_status); - new_menu_item_with_gaim_icon(submenu, + new_menu_item_with_status_icon(submenu, gaim_savedstatus_get_title(saved_status), gaim_savedstatus_get_type(saved_status), G_CALLBACK(activate_saved_status_cb), GINT_TO_POINTER(creation_time), 0, 0, NULL); @@ -475,8 +475,8 @@ pidgin_separator(submenu); - new_menu_item_with_gaim_icon(submenu, _("New..."), GAIM_STATUS_AVAILABLE, G_CALLBACK(show_custom_status_editor_cb), NULL, 0, 0, NULL); - new_menu_item_with_gaim_icon(submenu, _("Saved..."), GAIM_STATUS_AVAILABLE, G_CALLBACK(pidgin_status_window_show), NULL, 0, 0, NULL); + new_menu_item_with_status_icon(submenu, _("New..."), GAIM_STATUS_AVAILABLE, G_CALLBACK(show_custom_status_editor_cb), NULL, 0, 0, NULL); + new_menu_item_with_status_icon(submenu, _("Saved..."), GAIM_STATUS_AVAILABLE, G_CALLBACK(pidgin_status_window_show), NULL, 0, 0, NULL); return menuitem; }
--- a/pidgin/gtkft.c Sun Mar 18 21:12:40 2007 +0000 +++ b/pidgin/gtkft.c Mon Mar 19 06:01:29 2007 +0000 @@ -703,8 +703,8 @@ /* Setup the initial table */ dialog->table = table = gtk_table_new(9, 2, FALSE); - gtk_table_set_row_spacings(GTK_TABLE(table), GAIM_HIG_BOX_SPACE); - gtk_table_set_col_spacings(GTK_TABLE(table), GAIM_HIG_BOX_SPACE); + gtk_table_set_row_spacings(GTK_TABLE(table), PIDGIN_HIG_BOX_SPACE); + gtk_table_set_col_spacings(GTK_TABLE(table), PIDGIN_HIG_BOX_SPACE); /* Setup the labels */ for (i = 0; i < sizeof(labels) / sizeof(*labels); i++) { @@ -761,18 +761,18 @@ dialog->window = window = gtk_window_new(GTK_WINDOW_TOPLEVEL); gtk_window_set_role(GTK_WINDOW(window), "file transfer"); gtk_window_set_title(GTK_WINDOW(window), _("File Transfers")); - gtk_container_set_border_width(GTK_CONTAINER(window), GAIM_HIG_BORDER); + gtk_container_set_border_width(GTK_CONTAINER(window), PIDGIN_HIG_BORDER); g_signal_connect(G_OBJECT(window), "delete_event", G_CALLBACK(delete_win_cb), dialog); /* Create the parent vbox for everything. */ - vbox1 = gtk_vbox_new(FALSE, GAIM_HIG_BORDER); + vbox1 = gtk_vbox_new(FALSE, PIDGIN_HIG_BORDER); gtk_container_add(GTK_CONTAINER(window), vbox1); gtk_widget_show(vbox1); /* Create the main vbox for top half of the window. */ - vbox2 = gtk_vbox_new(FALSE, GAIM_HIG_BOX_SPACE); + vbox2 = gtk_vbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); gtk_box_pack_start(GTK_BOX(vbox1), vbox2, TRUE, TRUE, 0); gtk_widget_show(vbox2); @@ -816,7 +816,7 @@ /* Now the button box for the buttons */ bbox = gtk_hbutton_box_new(); - gtk_box_set_spacing(GTK_BOX(bbox), GAIM_HIG_BOX_SPACE); + gtk_box_set_spacing(GTK_BOX(bbox), PIDGIN_HIG_BOX_SPACE); gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END); gtk_box_pack_end(GTK_BOX(vbox1), bbox, FALSE, TRUE, 0); gtk_widget_show(bbox);
--- a/pidgin/gtklog.c Sun Mar 18 21:12:40 2007 +0000 +++ b/pidgin/gtklog.c Mon Mar 19 06:01:29 2007 +0000 @@ -541,7 +541,7 @@ /* Steal the "HELP" response and use it to trigger browsing to the logs folder */ gtk_dialog_add_button(GTK_DIALOG(lv->window), _("_Browse logs folder"), GTK_RESPONSE_HELP); #endif - gtk_container_set_border_width (GTK_CONTAINER(lv->window), GAIM_HIG_BOX_SPACE); + gtk_container_set_border_width (GTK_CONTAINER(lv->window), PIDGIN_HIG_BOX_SPACE); gtk_dialog_set_has_separator(GTK_DIALOG(lv->window), FALSE); gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(lv->window)->vbox), 0); g_signal_connect(G_OBJECT(lv->window), "response", @@ -550,8 +550,8 @@ /* Icon *************/ if (icon != NULL) { - title_box = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE); - gtk_container_set_border_width(GTK_CONTAINER(title_box), GAIM_HIG_BOX_SPACE); + title_box = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); + gtk_container_set_border_width(GTK_CONTAINER(title_box), PIDGIN_HIG_BOX_SPACE); gtk_box_pack_start(GTK_BOX(GTK_DIALOG(lv->window)->vbox), title_box, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(title_box), icon, FALSE, FALSE, 0); @@ -570,7 +570,7 @@ /* Pane *************/ pane = gtk_hpaned_new(); - gtk_container_set_border_width(GTK_CONTAINER(pane), GAIM_HIG_BOX_SPACE); + gtk_container_set_border_width(GTK_CONTAINER(pane), PIDGIN_HIG_BOX_SPACE); gtk_box_pack_start(GTK_BOX(GTK_DIALOG(lv->window)->vbox), pane, TRUE, TRUE, 0); /* List *************/ @@ -614,7 +614,7 @@ } /* A fancy little box ************/ - vbox = gtk_vbox_new(FALSE, GAIM_HIG_BOX_SPACE); + vbox = gtk_vbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); gtk_paned_add2(GTK_PANED(pane), vbox); /* Viewer ************/ @@ -625,7 +625,7 @@ gtk_widget_show(frame); /* Search box **********/ - hbox = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE); + hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); lv->entry = gtk_entry_new(); gtk_box_pack_start(GTK_BOX(hbox), lv->entry, TRUE, TRUE, 0);
--- a/pidgin/gtknotify.c Sun Mar 18 21:12:40 2007 +0000 +++ b/pidgin/gtknotify.c Mon Mar 19 06:01:29 2007 +0000 @@ -45,7 +45,7 @@ GtkWidget *label; GtkTreeIter iter; int count; -} GaimNotifyMailData; +} PidginNotifyMailData; typedef struct { @@ -56,14 +56,14 @@ gpointer user_data; GaimNotifySearchResults *results; -} GaimNotifySearchResultsData; +} PidginNotifySearchResultsData; typedef struct { GaimNotifySearchButton *button; - GaimNotifySearchResultsData *data; + PidginNotifySearchResultsData *data; -} GaimNotifySearchResultsButtonData; +} PidginNotifySearchResultsButtonData; enum { @@ -102,7 +102,7 @@ static void email_response_cb(GtkDialog *dlg, gint id, PidginMailDialog *dialog) { - GaimNotifyMailData *data = NULL; + PidginNotifyMailData *data = NULL; GtkTreeIter iter; if (id == GTK_RESPONSE_YES) @@ -162,15 +162,15 @@ } static void -searchresults_close_cb(GaimNotifySearchResultsData *data, GdkEvent *event, gpointer user_data) +searchresults_close_cb(PidginNotifySearchResultsData *data, GdkEvent *event, gpointer user_data) { gaim_notify_close(GAIM_NOTIFY_SEARCHRESULTS, data); } static void -searchresults_callback_wrapper_cb(GtkWidget *widget, GaimNotifySearchResultsButtonData *bd) +searchresults_callback_wrapper_cb(GtkWidget *widget, PidginNotifySearchResultsButtonData *bd) { - GaimNotifySearchResultsData *data = bd->data; + PidginNotifySearchResultsData *data = bd->data; GtkTreeSelection *selection; GtkTreeModel *model; @@ -235,7 +235,7 @@ gtk_misc_set_alignment(GTK_MISC(img), 0, 0); } - dialog = gtk_dialog_new_with_buttons(title ? title : GAIM_ALERT_TITLE, + dialog = gtk_dialog_new_with_buttons(title ? title : PIDGIN_ALERT_TITLE, NULL, 0, GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, NULL); @@ -244,13 +244,13 @@ g_signal_connect(G_OBJECT(dialog), "response", G_CALLBACK(message_response_cb), dialog); - gtk_container_set_border_width(GTK_CONTAINER(dialog), GAIM_HIG_BORDER); + gtk_container_set_border_width(GTK_CONTAINER(dialog), PIDGIN_HIG_BORDER); 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), GAIM_HIG_BORDER); - gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), GAIM_HIG_BOX_SPACE); + gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(dialog)->vbox), PIDGIN_HIG_BORDER); + gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), PIDGIN_HIG_BOX_SPACE); - hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER); + hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BORDER); gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox); if (img != NULL) @@ -281,7 +281,7 @@ { GtkTreeIter iter; GtkTreeModel *model; - GaimNotifyMailData *data; + PidginNotifyMailData *data; gboolean active = TRUE; if (gtk_tree_selection_get_selected(sel, &model, &iter) == FALSE) @@ -340,10 +340,10 @@ PIDGIN_STOCK_OPEN_MAIL, GTK_RESPONSE_YES); /* Setup the dialog */ - gtk_container_set_border_width(GTK_CONTAINER(dialog), GAIM_HIG_BOX_SPACE); - gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), GAIM_HIG_BOX_SPACE); + gtk_container_set_border_width(GTK_CONTAINER(dialog), PIDGIN_HIG_BOX_SPACE); + gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), PIDGIN_HIG_BOX_SPACE); gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE); - gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(dialog)->vbox), GAIM_HIG_BORDER); + gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(dialog)->vbox), PIDGIN_HIG_BORDER); /* Vertical box */ vbox = GTK_DIALOG(dialog)->vbox; @@ -402,7 +402,7 @@ static void * pidgin_notify_add_mail(GtkTreeStore *treemodel, GaimAccount *account, char *notification, const char *url, int count) { - GaimNotifyMailData *data = NULL; + PidginNotifyMailData *data = NULL; GtkTreeIter iter; GdkPixbuf *icon; gboolean new_n = TRUE; @@ -427,7 +427,7 @@ } if (new_n) { - data = g_new0(GaimNotifyMailData, 1); + data = g_new0(PidginNotifyMailData, 1); gtk_tree_store_append(treemodel, &iter, NULL); } @@ -457,7 +457,7 @@ GtkWidget *dialog = NULL; char *notification; GaimAccount *account; - GaimNotifyMailData *data = NULL; + PidginNotifyMailData *data = NULL; account = gaim_connection_get_account(gc); dialog = pidgin_get_mail_dialog(); /* This creates mail_dialog if necessary */ @@ -566,13 +566,13 @@ window = gtk_window_new(GTK_WINDOW_TOPLEVEL); gtk_window_set_title(GTK_WINDOW(window), title); gtk_window_set_type_hint(GTK_WINDOW(window), GDK_WINDOW_TYPE_HINT_DIALOG); - gtk_container_set_border_width(GTK_CONTAINER(window), GAIM_HIG_BORDER); + gtk_container_set_border_width(GTK_CONTAINER(window), PIDGIN_HIG_BORDER); g_signal_connect(G_OBJECT(window), "delete_event", G_CALLBACK(formatted_close_cb), NULL); /* Setup the main vbox */ - vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER); + vbox = gtk_vbox_new(FALSE, PIDGIN_HIG_BORDER); gtk_container_add(GTK_CONTAINER(window), vbox); gtk_widget_show(vbox); @@ -638,7 +638,7 @@ pidgin_notify_searchresults_new_rows(GaimConnection *gc, GaimNotifySearchResults *results, void *data_) { - GaimNotifySearchResultsData *data = data_; + PidginNotifySearchResultsData *data = data_; GtkListStore *model = data->model; GtkTreeIter iter; GdkPixbuf *pixbuf; @@ -693,14 +693,14 @@ GtkWidget *button_area; GtkWidget *label; GtkWidget *sw; - GaimNotifySearchResultsData *data; + PidginNotifySearchResultsData *data; char *label_text; char *primary_esc, *secondary_esc; g_return_val_if_fail(gc != NULL, NULL); g_return_val_if_fail(results != NULL, NULL); - data = g_malloc(sizeof(GaimNotifySearchResultsData)); + data = g_malloc(sizeof(PidginNotifySearchResultsData)); data->user_data = user_data; data->results = results; @@ -708,13 +708,13 @@ window = gtk_window_new(GTK_WINDOW_TOPLEVEL); gtk_window_set_title(GTK_WINDOW(window), (title ? title :_("Search Results"))); gtk_window_set_type_hint(GTK_WINDOW(window), GDK_WINDOW_TYPE_HINT_DIALOG); - gtk_container_set_border_width(GTK_CONTAINER(window), GAIM_HIG_BORDER); + gtk_container_set_border_width(GTK_CONTAINER(window), PIDGIN_HIG_BORDER); g_signal_connect_swapped(G_OBJECT(window), "delete_event", G_CALLBACK(searchresults_close_cb), data); /* Setup the main vbox */ - vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER); + vbox = gtk_vbox_new(FALSE, PIDGIN_HIG_BORDER); gtk_container_add(GTK_CONTAINER(window), vbox); gtk_widget_show(vbox); @@ -784,7 +784,7 @@ button_area = gtk_hbutton_box_new(); gtk_box_pack_start(GTK_BOX(vbox), button_area, FALSE, FALSE, 0); gtk_button_box_set_layout(GTK_BUTTON_BOX(button_area), GTK_BUTTONBOX_END); - gtk_box_set_spacing(GTK_BOX(button_area), GAIM_HIG_BORDER); + gtk_box_set_spacing(GTK_BOX(button_area), PIDGIN_HIG_BORDER); gtk_widget_show(button_area); for (i = 0; i < g_list_length(results->buttons); i++) { @@ -820,12 +820,12 @@ gaim_debug_warning("gtknotify", "Incorrect button type: %d\n", b->type); } if (button != NULL) { - GaimNotifySearchResultsButtonData *bd; + PidginNotifySearchResultsButtonData *bd; gtk_box_pack_start(GTK_BOX(button_area), button, FALSE, FALSE, 0); gtk_widget_show(button); - bd = g_new0(GaimNotifySearchResultsButtonData, 1); + bd = g_new0(PidginNotifySearchResultsButtonData, 1); bd->button = b; bd->data = data; @@ -876,14 +876,14 @@ { if (type == GAIM_NOTIFY_EMAIL || type == GAIM_NOTIFY_EMAILS) { - GaimNotifyMailData *data = (GaimNotifyMailData *)ui_handle; + PidginNotifyMailData *data = (PidginNotifyMailData *)ui_handle; g_free(data->url); g_free(data); } else if (type == GAIM_NOTIFY_SEARCHRESULTS) { - GaimNotifySearchResultsData *data = (GaimNotifySearchResultsData *)ui_handle; + PidginNotifySearchResultsData *data = (PidginNotifySearchResultsData *)ui_handle; gtk_widget_destroy(data->window); gaim_notify_searchresults_free(data->results);
--- a/pidgin/gtkplugin.c Sun Mar 18 21:12:40 2007 +0000 +++ b/pidgin/gtkplugin.c Mon Mar 19 06:01:29 2007 +0000 @@ -470,7 +470,7 @@ if (box == NULL) break; - dialog = gtk_dialog_new_with_buttons(GAIM_ALERT_TITLE, GTK_WINDOW(d), + dialog = gtk_dialog_new_with_buttons(PIDGIN_ALERT_TITLE, GTK_WINDOW(d), GTK_DIALOG_NO_SEPARATOR | GTK_DIALOG_DESTROY_WITH_PARENT, GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, NULL);
--- a/pidgin/gtkpluginpref.c Sun Mar 18 21:12:40 2007 +0000 +++ b/pidgin/gtkpluginpref.c Mon Mar 19 06:01:29 2007 +0000 @@ -92,9 +92,9 @@ case GAIM_PLUGIN_PREF_NONE: default: if (format == GAIM_STRING_FORMAT_TYPE_NONE) - box = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE); + box = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); else - box = gtk_vbox_new(FALSE, GAIM_HIG_BOX_SPACE); + box = gtk_vbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); gtk_widget_show(box); gtk_box_pack_start(GTK_BOX(parent), box, FALSE, FALSE, 0); @@ -117,7 +117,7 @@ { gtk_entry_set_visibility(GTK_ENTRY(entry), FALSE); if (gtk_entry_get_invisible_char(GTK_ENTRY(entry)) == '*') - gtk_entry_set_invisible_char(GTK_ENTRY(entry), GAIM_INVISIBLE_CHAR); + gtk_entry_set_invisible_char(GTK_ENTRY(entry), PIDGIN_INVISIBLE_CHAR); } g_signal_connect(G_OBJECT(entry), "changed", G_CALLBACK(entry_cb), @@ -134,7 +134,7 @@ GtkWidget *toolbar; GtkWidget *frame; - hbox = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE); + hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); gtk_box_pack_start(GTK_BOX(box), hbox, FALSE, FALSE, 0); gtk_widget_show(hbox); @@ -213,7 +213,7 @@ sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); parent = ret = gtk_vbox_new(FALSE, 16); - gtk_container_set_border_width(GTK_CONTAINER(ret), GAIM_HIG_BORDER); + gtk_container_set_border_width(GTK_CONTAINER(ret), PIDGIN_HIG_BORDER); gtk_widget_show(ret); for(pp = gaim_plugin_pref_frame_get_prefs(frame);
--- a/pidgin/gtkpounce.c Sun Mar 18 21:12:40 2007 +0000 +++ b/pidgin/gtkpounce.c Mon Mar 19 06:01:29 2007 +0000 @@ -504,25 +504,25 @@ (cur_pounce == NULL ? _("New Buddy Pounce") : _("Edit Buddy Pounce"))); - gtk_container_set_border_width(GTK_CONTAINER(window), GAIM_HIG_BORDER); + gtk_container_set_border_width(GTK_CONTAINER(window), PIDGIN_HIG_BORDER); g_signal_connect(G_OBJECT(window), "delete_event", G_CALLBACK(delete_win_cb), dialog); /* Create the parent vbox for everything. */ - vbox1 = gtk_vbox_new(FALSE, GAIM_HIG_BORDER); + vbox1 = gtk_vbox_new(FALSE, PIDGIN_HIG_BORDER); gtk_container_add(GTK_CONTAINER(window), vbox1); gtk_widget_show(vbox1); /* Create the vbox that will contain all the prefs stuff. */ - vbox2 = gtk_vbox_new(FALSE, GAIM_HIG_BOX_SPACE); + vbox2 = gtk_vbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); gtk_box_pack_start(GTK_BOX(vbox1), vbox2, TRUE, TRUE, 0); /* Create the "Pounce on Whom" frame. */ frame = pidgin_make_frame(vbox2, _("Pounce on Whom")); /* Account: */ - hbox = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE); + hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0); gtk_widget_show(hbox); @@ -542,7 +542,7 @@ pidgin_set_accessible_label (dialog->account_menu, label); /* Buddy: */ - hbox = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE); + hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0); gtk_widget_show(hbox); @@ -576,7 +576,7 @@ table = gtk_table_new(5, 2, FALSE); gtk_container_add(GTK_CONTAINER(frame), table); - gtk_table_set_col_spacings(GTK_TABLE(table), GAIM_HIG_BORDER); + gtk_table_set_col_spacings(GTK_TABLE(table), PIDGIN_HIG_BORDER); gtk_widget_show(table); dialog->signon = @@ -637,7 +637,7 @@ table = gtk_table_new(3, 5, FALSE); gtk_container_add(GTK_CONTAINER(frame), table); - gtk_table_set_col_spacings(GTK_TABLE(table), GAIM_HIG_BORDER); + gtk_table_set_col_spacings(GTK_TABLE(table), PIDGIN_HIG_BORDER); gtk_widget_show(table); dialog->open_win @@ -706,7 +706,7 @@ gtk_table_attach(GTK_TABLE(table), dialog->play_sound_test, 3, 4, 4, 5, GTK_FILL | GTK_EXPAND, 0, 0, 0); - gtk_table_set_row_spacings(GTK_TABLE(table), GAIM_HIG_BOX_SPACE / 2); + gtk_table_set_row_spacings(GTK_TABLE(table), PIDGIN_HIG_BOX_SPACE / 2); gtk_widget_show(dialog->open_win); gtk_widget_show(dialog->popup); @@ -777,7 +777,7 @@ table = gtk_table_new(2, 1, FALSE); gtk_container_add(GTK_CONTAINER(frame), table); - gtk_table_set_col_spacings(GTK_TABLE(table), GAIM_HIG_BORDER); + gtk_table_set_col_spacings(GTK_TABLE(table), PIDGIN_HIG_BORDER); gtk_widget_show(table); dialog->on_away = @@ -795,7 +795,7 @@ /* Now the button box! */ bbox = gtk_hbutton_box_new(); - gtk_box_set_spacing(GTK_BOX(bbox), GAIM_HIG_BOX_SPACE); + gtk_box_set_spacing(GTK_BOX(bbox), PIDGIN_HIG_BOX_SPACE); gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END); gtk_box_pack_end(GTK_BOX(vbox1), bbox, FALSE, FALSE, 0); gtk_widget_show(bbox); @@ -1323,7 +1323,7 @@ gtk_window_set_default_size(GTK_WINDOW(win), width, height); gtk_window_set_role(GTK_WINDOW(win), "pounces"); gtk_window_set_title(GTK_WINDOW(win), _("Buddy Pounces")); - gtk_container_set_border_width(GTK_CONTAINER(win), GAIM_HIG_BORDER); + gtk_container_set_border_width(GTK_CONTAINER(win), PIDGIN_HIG_BORDER); g_signal_connect(G_OBJECT(win), "delete_event", G_CALLBACK(pounces_manager_destroy_cb), dialog); @@ -1331,7 +1331,7 @@ G_CALLBACK(pounces_manager_configure_cb), dialog); /* Setup the vbox */ - vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER); + vbox = gtk_vbox_new(FALSE, PIDGIN_HIG_BORDER); gtk_container_add(GTK_CONTAINER(win), vbox); gtk_widget_show(vbox); @@ -1341,7 +1341,7 @@ /* Button box. */ bbox = gtk_hbutton_box_new(); - gtk_box_set_spacing(GTK_BOX(bbox), GAIM_HIG_BOX_SPACE); + gtk_box_set_spacing(GTK_BOX(bbox), PIDGIN_HIG_BOX_SPACE); gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END); gtk_box_pack_end(GTK_BOX(vbox), bbox, FALSE, TRUE, 0); gtk_widget_show(bbox);
--- a/pidgin/gtkprefs.c Sun Mar 18 21:12:40 2007 +0000 +++ b/pidgin/gtkprefs.c Mon Mar 19 06:01:29 2007 +0000 @@ -632,8 +632,8 @@ GtkWidget *label; GtkTargetEntry te[3] = {{"text/plain", 0, 0},{"text/uri-list", 0, 1},{"STRING", 0, 2}}; - ret = gtk_vbox_new(FALSE, GAIM_HIG_CAT_SPACE); - gtk_container_set_border_width (GTK_CONTAINER (ret), GAIM_HIG_BORDER); + ret = gtk_vbox_new(FALSE, PIDGIN_HIG_CAT_SPACE); + gtk_container_set_border_width (GTK_CONTAINER (ret), PIDGIN_HIG_BORDER); label = gtk_label_new(_("Select a smiley theme that you would like to use from the list below. New themes can be installed by dragging and dropping them onto the theme list.")); @@ -808,8 +808,8 @@ GtkSizeGroup *sg; GList *names = NULL; - ret = gtk_vbox_new(FALSE, GAIM_HIG_CAT_SPACE); - gtk_container_set_border_width(GTK_CONTAINER(ret), GAIM_HIG_BORDER); + ret = gtk_vbox_new(FALSE, PIDGIN_HIG_CAT_SPACE); + gtk_container_set_border_width(GTK_CONTAINER(ret), PIDGIN_HIG_BORDER); sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); @@ -892,8 +892,8 @@ GtkWidget *imhtml; GtkWidget *frame; - ret = gtk_vbox_new(FALSE, GAIM_HIG_CAT_SPACE); - gtk_container_set_border_width(GTK_CONTAINER(ret), GAIM_HIG_BORDER); + ret = gtk_vbox_new(FALSE, PIDGIN_HIG_CAT_SPACE); + gtk_container_set_border_width(GTK_CONTAINER(ret), PIDGIN_HIG_BORDER); vbox = pidgin_make_frame(ret, _("Conversations")); @@ -1009,15 +1009,15 @@ GtkSizeGroup *sg; GaimProxyInfo *proxy_info = NULL; - ret = gtk_vbox_new(FALSE, GAIM_HIG_CAT_SPACE); - gtk_container_set_border_width (GTK_CONTAINER (ret), GAIM_HIG_BORDER); + ret = gtk_vbox_new(FALSE, PIDGIN_HIG_CAT_SPACE); + gtk_container_set_border_width (GTK_CONTAINER (ret), PIDGIN_HIG_BORDER); vbox = pidgin_make_frame (ret, _("IP Address")); sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); pidgin_prefs_labeled_entry(vbox,_("ST_UN server:"), "/core/network/stun_server", sg); - hbox = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE); + hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); gtk_container_add(GTK_CONTAINER(vbox), hbox); label = gtk_label_new(NULL); @@ -1176,7 +1176,7 @@ gtk_table_attach(GTK_TABLE(table), entry, 3, 4, 1, 2, GTK_FILL , 0, 0, 0); gtk_entry_set_visibility(GTK_ENTRY(entry), FALSE); if (gtk_entry_get_invisible_char(GTK_ENTRY(entry)) == '*') - gtk_entry_set_invisible_char(GTK_ENTRY(entry), GAIM_INVISIBLE_CHAR); + gtk_entry_set_invisible_char(GTK_ENTRY(entry), PIDGIN_INVISIBLE_CHAR); g_signal_connect(G_OBJECT(entry), "changed", G_CALLBACK(proxy_print_option), (void *)PROXYPASS); @@ -1280,8 +1280,8 @@ GtkSizeGroup *sg; GList *browsers = NULL; - ret = gtk_vbox_new(FALSE, GAIM_HIG_CAT_SPACE); - gtk_container_set_border_width (GTK_CONTAINER (ret), GAIM_HIG_BORDER); + ret = gtk_vbox_new(FALSE, PIDGIN_HIG_CAT_SPACE); + gtk_container_set_border_width (GTK_CONTAINER (ret), PIDGIN_HIG_BORDER); sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); vbox = pidgin_make_frame (ret, _("Browser Selection")); @@ -1348,8 +1348,8 @@ GtkWidget *vbox; GList *names; - ret = gtk_vbox_new(FALSE, GAIM_HIG_CAT_SPACE); - gtk_container_set_border_width (GTK_CONTAINER (ret), GAIM_HIG_BORDER); + ret = gtk_vbox_new(FALSE, PIDGIN_HIG_CAT_SPACE); + gtk_container_set_border_width (GTK_CONTAINER (ret), PIDGIN_HIG_BORDER); vbox = pidgin_make_frame (ret, _("Logging")); @@ -1587,8 +1587,8 @@ const char *cmd; #endif - ret = gtk_vbox_new(FALSE, GAIM_HIG_CAT_SPACE); - gtk_container_set_border_width (GTK_CONTAINER (ret), GAIM_HIG_BORDER); + ret = gtk_vbox_new(FALSE, PIDGIN_HIG_CAT_SPACE); + gtk_container_set_border_width (GTK_CONTAINER (ret), PIDGIN_HIG_BORDER); sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); @@ -1607,7 +1607,7 @@ gtk_size_group_add_widget(sg, dd); gtk_misc_set_alignment(GTK_MISC(dd), 0, 0.5); - hbox = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE); + hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); label = gtk_label_new_with_mnemonic(_("Sound c_ommand:\n(%s for filename)")); @@ -1647,7 +1647,7 @@ NULL); #ifdef USE_GSTREAMER - hbox = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE); + hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); label = gtk_label_new_with_mnemonic(_("Volume:")); @@ -1744,7 +1744,7 @@ g_object_unref(G_OBJECT(event_store)); gtk_container_add(GTK_CONTAINER(sw), event_view); - hbox = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE); + hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); sound_entry = gtk_entry_new(); pref = g_strdup_printf("/gaim/gtk/sound/file/%s", @@ -1753,7 +1753,7 @@ g_free(pref); gtk_entry_set_text(GTK_ENTRY(sound_entry), (file && *file != '\0') ? file : "(default)"); gtk_editable_set_editable(GTK_EDITABLE(sound_entry), FALSE); - gtk_box_pack_start(GTK_BOX(hbox), sound_entry, FALSE, FALSE, GAIM_HIG_BOX_SPACE); + gtk_box_pack_start(GTK_BOX(hbox), sound_entry, FALSE, FALSE, PIDGIN_HIG_BOX_SPACE); button = gtk_button_new_with_label(_("Test")); g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(test_sound), NULL); @@ -1798,8 +1798,8 @@ GtkWidget *menu; GtkSizeGroup *sg; - ret = gtk_vbox_new(FALSE, GAIM_HIG_CAT_SPACE); - gtk_container_set_border_width (GTK_CONTAINER (ret), GAIM_HIG_BORDER); + ret = gtk_vbox_new(FALSE, PIDGIN_HIG_CAT_SPACE); + gtk_container_set_border_width (GTK_CONTAINER (ret), PIDGIN_HIG_BORDER); sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); @@ -1950,11 +1950,11 @@ gtk_window_set_role(GTK_WINDOW(prefs), "preferences"); gtk_window_set_title(GTK_WINDOW(prefs), _("Preferences")); gtk_window_set_resizable (GTK_WINDOW(prefs), FALSE); - gtk_container_set_border_width(GTK_CONTAINER(prefs), GAIM_HIG_BORDER); + gtk_container_set_border_width(GTK_CONTAINER(prefs), PIDGIN_HIG_BORDER); g_signal_connect(G_OBJECT(prefs), "destroy", G_CALLBACK(delete_prefs), NULL); - vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER); + vbox = gtk_vbox_new(FALSE, PIDGIN_HIG_BORDER); gtk_container_add(GTK_CONTAINER(prefs), vbox); gtk_widget_show(vbox); @@ -1965,7 +1965,7 @@ /* The buttons to press! */ bbox = gtk_hbutton_box_new(); - gtk_box_set_spacing(GTK_BOX(bbox), GAIM_HIG_BOX_SPACE); + gtk_box_set_spacing(GTK_BOX(bbox), PIDGIN_HIG_BOX_SPACE); gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END); gtk_box_pack_start(GTK_BOX(vbox), bbox, FALSE, FALSE, 0); gtk_widget_show (bbox);
--- a/pidgin/gtkprivacy.c Sun Mar 18 21:12:40 2007 +0000 +++ b/pidgin/gtkprivacy.c Mon Mar 19 06:01:29 2007 +0000 @@ -370,13 +370,13 @@ gtk_window_set_resizable(GTK_WINDOW(dialog->win), FALSE); gtk_window_set_role(GTK_WINDOW(dialog->win), "privacy"); gtk_window_set_title(GTK_WINDOW(dialog->win), _("Privacy")); - gtk_container_set_border_width(GTK_CONTAINER(dialog->win), GAIM_HIG_BORDER); + gtk_container_set_border_width(GTK_CONTAINER(dialog->win), PIDGIN_HIG_BORDER); g_signal_connect(G_OBJECT(dialog->win), "delete_event", G_CALLBACK(destroy_cb), dialog); /* Main vbox */ - vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER); + vbox = gtk_vbox_new(FALSE, PIDGIN_HIG_BORDER); gtk_container_add(GTK_CONTAINER(dialog->win), vbox); gtk_widget_show(vbox); @@ -389,7 +389,7 @@ gtk_widget_show(label); /* Hbox for the accounts drop-down and label. */ - hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER); + hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BORDER); gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); gtk_widget_show(hbox);
--- a/pidgin/gtkrequest.c Sun Mar 18 21:12:40 2007 +0000 +++ b/pidgin/gtkrequest.c Mon Mar 19 06:01:29 2007 +0000 @@ -309,7 +309,7 @@ data->cbs[1] = cancel_cb; /* Create the dialog. */ - dialog = gtk_dialog_new_with_buttons(title ? title : GAIM_ALERT_TITLE, + dialog = gtk_dialog_new_with_buttons(title ? title : PIDGIN_ALERT_TITLE, NULL, 0, text_to_stock(cancel_text), 1, text_to_stock(ok_text), 0, @@ -320,15 +320,15 @@ G_CALLBACK(input_response_cb), data); /* Setup the dialog */ - gtk_container_set_border_width(GTK_CONTAINER(dialog), GAIM_HIG_BORDER/2); - gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), GAIM_HIG_BORDER/2); + 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_window_set_resizable(GTK_WINDOW(dialog), FALSE); 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), GAIM_HIG_BORDER); + gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(dialog)->vbox), PIDGIN_HIG_BORDER); /* Setup the main horizontal box */ - hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER); + hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BORDER); gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox); /* Dialog icon. */ @@ -338,7 +338,7 @@ gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0); /* Vertical box */ - vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER); + vbox = gtk_vbox_new(FALSE, PIDGIN_HIG_BORDER); gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0); @@ -424,7 +424,7 @@ { gtk_entry_set_visibility(GTK_ENTRY(entry), FALSE); if (gtk_entry_get_invisible_char(GTK_ENTRY(entry)) == '*') - gtk_entry_set_invisible_char(GTK_ENTRY(entry), GAIM_INVISIBLE_CHAR); + gtk_entry_set_invisible_char(GTK_ENTRY(entry), PIDGIN_INVISIBLE_CHAR); } } } @@ -482,14 +482,14 @@ G_CALLBACK(choice_response_cb), data); /* Setup the dialog */ - gtk_container_set_border_width(GTK_CONTAINER(dialog), GAIM_HIG_BORDER/2); - gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), GAIM_HIG_BORDER/2); + 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_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), GAIM_HIG_BORDER); + gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(dialog)->vbox), PIDGIN_HIG_BORDER); /* Setup the main horizontal box */ - hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER); + hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BORDER); gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox); /* Dialog icon. */ @@ -499,7 +499,7 @@ gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0); /* Vertical box */ - vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER); + vbox = gtk_vbox_new(FALSE, PIDGIN_HIG_BORDER); gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0); /* Descriptive label */ @@ -522,7 +522,7 @@ g_free(label_text); - vbox2 = gtk_vbox_new(FALSE, GAIM_HIG_BOX_SPACE); + vbox2 = gtk_vbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); gtk_box_pack_start(GTK_BOX(vbox), vbox2, FALSE, FALSE, 0); while ((radio_text = va_arg(args, char*))) { int resp = va_arg(args, int); @@ -591,14 +591,14 @@ G_CALLBACK(action_response_cb), data); /* Setup the dialog */ - gtk_container_set_border_width(GTK_CONTAINER(dialog), GAIM_HIG_BORDER/2); - gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), GAIM_HIG_BORDER/2); + 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_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), GAIM_HIG_BORDER); + gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(dialog)->vbox), PIDGIN_HIG_BORDER); /* Setup the main horizontal box */ - hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER); + hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BORDER); gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox); /* Dialog icon. */ @@ -608,7 +608,7 @@ gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0); /* Vertical box */ - vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER); + vbox = gtk_vbox_new(FALSE, PIDGIN_HIG_BORDER); gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0); /* Descriptive label */ @@ -762,7 +762,7 @@ { gtk_entry_set_visibility(GTK_ENTRY(widget), FALSE); if (gtk_entry_get_invisible_char(GTK_ENTRY(widget)) == '*') - gtk_entry_set_invisible_char(GTK_ENTRY(widget), GAIM_INVISIBLE_CHAR); + gtk_entry_set_invisible_char(GTK_ENTRY(widget), PIDGIN_INVISIBLE_CHAR); } gtk_editable_set_editable(GTK_EDITABLE(widget), @@ -863,7 +863,7 @@ gint i; if (g_list_length(labels) == 2) - box = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE); + box = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); else box = gtk_vbox_new(FALSE, 0); @@ -1066,13 +1066,13 @@ gtk_window_set_title(GTK_WINDOW(win), title); gtk_window_set_role(GTK_WINDOW(win), "multifield"); - gtk_container_set_border_width(GTK_CONTAINER(win), GAIM_HIG_BORDER); + gtk_container_set_border_width(GTK_CONTAINER(win), PIDGIN_HIG_BORDER); g_signal_connect(G_OBJECT(win), "delete_event", G_CALLBACK(destroy_multifield_cb), data); /* Setup the main horizontal box */ - hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER); + hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BORDER); gtk_container_add(GTK_CONTAINER(win), hbox); gtk_widget_show(hbox); @@ -1084,7 +1084,7 @@ gtk_widget_show(img); /* Setup the vbox */ - vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER); + vbox = gtk_vbox_new(FALSE, PIDGIN_HIG_BORDER); gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0); gtk_widget_show(vbox); @@ -1119,7 +1119,7 @@ gtk_box_pack_start(GTK_BOX(vbox), sw, TRUE, TRUE, 0); gtk_widget_show(sw); - vbox2 = gtk_vbox_new(FALSE, GAIM_HIG_BORDER); + vbox2 = gtk_vbox_new(FALSE, PIDGIN_HIG_BORDER); gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(sw), vbox2); gtk_widget_show(vbox2); } else { @@ -1205,8 +1205,8 @@ } table = gtk_table_new(rows, 2 * cols, FALSE); - gtk_table_set_row_spacings(GTK_TABLE(table), GAIM_HIG_BOX_SPACE); - gtk_table_set_col_spacings(GTK_TABLE(table), GAIM_HIG_BOX_SPACE); + gtk_table_set_row_spacings(GTK_TABLE(table), PIDGIN_HIG_BOX_SPACE); + gtk_table_set_col_spacings(GTK_TABLE(table), PIDGIN_HIG_BOX_SPACE); gtk_container_add(GTK_CONTAINER(frame), table); gtk_widget_show(table); @@ -1345,7 +1345,7 @@ /* Button box. */ bbox = gtk_hbutton_box_new(); - gtk_box_set_spacing(GTK_BOX(bbox), GAIM_HIG_BOX_SPACE); + gtk_box_set_spacing(GTK_BOX(bbox), PIDGIN_HIG_BOX_SPACE); gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END); gtk_box_pack_end(GTK_BOX(vbox), bbox, FALSE, TRUE, 0); gtk_widget_show(bbox);
--- a/pidgin/gtkroomlist.c Sun Mar 18 21:12:40 2007 +0000 +++ b/pidgin/gtkroomlist.c Mon Mar 19 06:01:29 2007 +0000 @@ -375,22 +375,22 @@ gtk_window_set_role(GTK_WINDOW(window), "room list"); gtk_window_set_title(GTK_WINDOW(window), _("Room List")); - gtk_container_set_border_width(GTK_CONTAINER(window), GAIM_HIG_BORDER); + gtk_container_set_border_width(GTK_CONTAINER(window), PIDGIN_HIG_BORDER); g_signal_connect(G_OBJECT(window), "delete_event", G_CALLBACK(delete_win_cb), dialog); /* Create the parent vbox for everything. */ - vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER); + vbox = gtk_vbox_new(FALSE, PIDGIN_HIG_BORDER); gtk_container_add(GTK_CONTAINER(window), vbox); gtk_widget_show(vbox); - vbox2 = gtk_vbox_new(FALSE, GAIM_HIG_BORDER); + vbox2 = gtk_vbox_new(FALSE, PIDGIN_HIG_BORDER); gtk_container_add(GTK_CONTAINER(vbox), vbox2); gtk_widget_show(vbox2); /* accounts dropdown list */ - account_hbox = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE); + account_hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); gtk_box_pack_start(GTK_BOX(vbox2), account_hbox, FALSE, FALSE, 0); gtk_widget_show(account_hbox); @@ -429,7 +429,7 @@ /* button box */ bbox = gtk_hbutton_box_new(); - gtk_box_set_spacing(GTK_BOX(bbox), GAIM_HIG_BOX_SPACE); + gtk_box_set_spacing(GTK_BOX(bbox), PIDGIN_HIG_BOX_SPACE); gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END); gtk_box_pack_start(GTK_BOX(vbox), bbox, FALSE, TRUE, 0); gtk_widget_show(bbox);
--- a/pidgin/gtksavedstatuses.c Sun Mar 18 21:12:40 2007 +0000 +++ b/pidgin/gtksavedstatuses.c Mon Mar 19 06:01:29 2007 +0000 @@ -554,7 +554,7 @@ gtk_window_set_default_size(GTK_WINDOW(win), width, height); gtk_window_set_role(GTK_WINDOW(win), "statuses"); gtk_window_set_title(GTK_WINDOW(win), _("Saved Statuses")); - gtk_container_set_border_width(GTK_CONTAINER(win), GAIM_HIG_BORDER); + gtk_container_set_border_width(GTK_CONTAINER(win), PIDGIN_HIG_BORDER); g_signal_connect(G_OBJECT(win), "delete_event", G_CALLBACK(status_window_destroy_cb), dialog); @@ -562,7 +562,7 @@ G_CALLBACK(configure_cb), dialog); /* Setup the vbox */ - vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER); + vbox = gtk_vbox_new(FALSE, PIDGIN_HIG_BORDER); gtk_container_add(GTK_CONTAINER(win), vbox); /* List of saved status states */ @@ -571,7 +571,7 @@ /* Button box. */ bbox = gtk_hbutton_box_new(); - gtk_box_set_spacing(GTK_BOX(bbox), GAIM_HIG_BOX_SPACE); + gtk_box_set_spacing(GTK_BOX(bbox), PIDGIN_HIG_BOX_SPACE); gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END); gtk_box_pack_end(GTK_BOX(vbox), bbox, FALSE, TRUE, 0); @@ -1088,19 +1088,19 @@ gtk_window_set_role(GTK_WINDOW(win), "status"); gtk_window_set_title(GTK_WINDOW(win), _("Status")); gtk_window_set_resizable(GTK_WINDOW(win), FALSE); - gtk_container_set_border_width(GTK_CONTAINER(win), GAIM_HIG_BORDER); + gtk_container_set_border_width(GTK_CONTAINER(win), PIDGIN_HIG_BORDER); g_signal_connect(G_OBJECT(win), "delete_event", G_CALLBACK(status_editor_destroy_cb), dialog); /* Setup the vbox */ - vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER); + vbox = gtk_vbox_new(FALSE, PIDGIN_HIG_BORDER); gtk_container_add(GTK_CONTAINER(win), vbox); sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); /* Title */ - hbox = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE); + hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); label = gtk_label_new_with_mnemonic(_("_Title:")); @@ -1119,7 +1119,7 @@ G_CALLBACK(editor_title_changed_cb), dialog); /* Status type */ - hbox = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE); + hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); label = gtk_label_new_with_mnemonic(_("_Status:")); @@ -1135,7 +1135,7 @@ gtk_box_pack_start(GTK_BOX(hbox), dropdown, TRUE, TRUE, 0); /* Status message */ - hbox = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE); + hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); label = gtk_label_new_with_mnemonic(_("_Message:")); @@ -1158,7 +1158,7 @@ gtk_box_pack_start(GTK_BOX(vbox), expander, FALSE, FALSE, 0); /* Setup the box that the expander will cover */ - dbox = gtk_vbox_new(FALSE, GAIM_HIG_CAT_SPACE); + dbox = gtk_vbox_new(FALSE, PIDGIN_HIG_CAT_SPACE); gtk_container_add(GTK_CONTAINER(expander), dbox); /* Different status message treeview */ @@ -1198,7 +1198,7 @@ /* Button box */ bbox = gtk_hbutton_box_new(); - gtk_box_set_spacing(GTK_BOX(bbox), GAIM_HIG_BOX_SPACE); + gtk_box_set_spacing(GTK_BOX(bbox), PIDGIN_HIG_BOX_SPACE); gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END); gtk_box_pack_end(GTK_BOX(vbox), bbox, FALSE, TRUE, 0); @@ -1428,19 +1428,19 @@ gtk_window_set_title(GTK_WINDOW(win), tmp); g_free(tmp); gtk_window_set_resizable(GTK_WINDOW(win), FALSE); - gtk_container_set_border_width(GTK_CONTAINER(win), GAIM_HIG_BORDER); + gtk_container_set_border_width(GTK_CONTAINER(win), PIDGIN_HIG_BORDER); g_signal_connect(G_OBJECT(win), "delete_event", G_CALLBACK(substatus_editor_destroy_cb), dialog); /* Setup the vbox */ - vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER); + vbox = gtk_vbox_new(FALSE, PIDGIN_HIG_BORDER); gtk_container_add(GTK_CONTAINER(win), vbox); sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); /* Status type */ - hbox = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE); + hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); label = gtk_label_new_with_mnemonic(_("_Status:")); @@ -1471,7 +1471,7 @@ gtk_box_pack_start(GTK_BOX(hbox), combo, FALSE, FALSE, 0); /* Status mesage */ - hbox = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE); + hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); label = gtk_label_new_with_mnemonic(_("_Message:")); @@ -1486,7 +1486,7 @@ /* Button box */ bbox = gtk_hbutton_box_new(); - gtk_box_set_spacing(GTK_BOX(bbox), GAIM_HIG_BOX_SPACE); + gtk_box_set_spacing(GTK_BOX(bbox), PIDGIN_HIG_BOX_SPACE); gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END); gtk_box_pack_end(GTK_BOX(vbox), bbox, FALSE, TRUE, 0);
--- a/pidgin/gtkstatusbox.c Sun Mar 18 21:12:40 2007 +0000 +++ b/pidgin/gtkstatusbox.c Mon Mar 19 06:01:29 2007 +0000 @@ -2315,7 +2315,7 @@ height = (oneline.height + pad_top + pad_bottom) * lines; height += (oneline.height + pad_inside) * (wrapped_lines - lines); - gtk_widget_set_size_request(status_box->vbox, -1, height + GAIM_HIG_BOX_SPACE); + gtk_widget_set_size_request(status_box->vbox, -1, height + PIDGIN_HIG_BOX_SPACE); } static void remove_typing_cb(PidginStatusBox *status_box)
--- a/pidgin/gtkutils.c Sun Mar 18 21:12:40 2007 +0000 +++ b/pidgin/gtkutils.c Mon Mar 19 06:01:29 2007 +0000 @@ -400,7 +400,7 @@ GtkWidget *vbox, *label, *hbox; char *labeltitle; - vbox = gtk_vbox_new(FALSE, GAIM_HIG_BOX_SPACE); + vbox = gtk_vbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); gtk_box_pack_start(GTK_BOX(parent), vbox, FALSE, FALSE, 0); gtk_widget_show(vbox); @@ -415,7 +415,7 @@ gtk_widget_show(label); pidgin_set_accessible_label (vbox, label); - hbox = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE); + hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); gtk_widget_show(hbox); @@ -423,7 +423,7 @@ gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); gtk_widget_show(label); - vbox = gtk_vbox_new(FALSE, GAIM_HIG_BOX_SPACE); + vbox = gtk_vbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0); gtk_widget_show(vbox); @@ -2359,7 +2359,7 @@ current_folder); gtk_widget_set_size_request(GTK_WIDGET(dialog->icon_preview), -1, 50); - hbox = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE); + hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); gtk_box_pack_start( GTK_BOX(GTK_FILE_SELECTION(dialog->icon_filesel)->main_vbox), hbox, FALSE, FALSE, 0); @@ -2909,7 +2909,7 @@ gtk_misc_set_alignment(GTK_MISC(img), 0, 0); vbox = gtk_vbox_new(FALSE,0); - gtk_container_set_border_width(GTK_CONTAINER(vbox), GAIM_HIG_BOX_SPACE); + gtk_container_set_border_width(GTK_CONTAINER(vbox), PIDGIN_HIG_BOX_SPACE); g_object_set_data(G_OBJECT(vbox), "gc" ,gc); minidialogs = g_slist_prepend(minidialogs, vbox); @@ -2943,7 +2943,7 @@ gtk_misc_set_alignment(GTK_MISC(label), 0, 0); gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0); - hbox2 = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE); + hbox2 = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); gtk_box_pack_start(GTK_BOX(vbox), hbox2, FALSE, FALSE, 0); va_start(args, user_data);
--- a/pidgin/gtkwhiteboard.c Sun Mar 18 21:12:40 2007 +0000 +++ b/pidgin/gtkwhiteboard.c Mon Mar 19 06:01:29 2007 +0000 @@ -173,13 +173,13 @@ /* Create horizontal box for the palette and all its entries */ hbox_palette = gtk_hbox_new(FALSE, 0); gtk_box_pack_start(GTK_BOX(vbox_palette_above_canvas_and_controls), - hbox_palette, FALSE, FALSE, GAIM_HIG_BORDER); + hbox_palette, FALSE, FALSE, PIDGIN_HIG_BORDER); gtk_widget_show(hbox_palette); /* Create horizontal box to seperate the canvas from the controls */ hbox_canvas_and_controls = gtk_hbox_new(FALSE, 0); gtk_box_pack_start(GTK_BOX(vbox_palette_above_canvas_and_controls), - hbox_canvas_and_controls, FALSE, FALSE, GAIM_HIG_BORDER); + hbox_canvas_and_controls, FALSE, FALSE, PIDGIN_HIG_BORDER); gtk_widget_show(hbox_canvas_and_controls); for(i = 0; i < PALETTE_NUM_COLORS; i++) @@ -196,13 +196,13 @@ gtk_widget_show(hbox_canvas_and_controls); gtk_container_add(GTK_CONTAINER(window), hbox_canvas_and_controls); - gtk_container_set_border_width(GTK_CONTAINER(window), GAIM_HIG_BORDER); + gtk_container_set_border_width(GTK_CONTAINER(window), PIDGIN_HIG_BORDER); /* Create the drawing area */ drawing_area = gtk_drawing_area_new(); gtkwb->drawing_area = drawing_area; gtk_widget_set_size_request(GTK_WIDGET(drawing_area), gtkwb->width, gtkwb->height); - gtk_box_pack_start(GTK_BOX(hbox_canvas_and_controls), drawing_area, TRUE, TRUE, GAIM_HIG_BOX_SPACE); + gtk_box_pack_start(GTK_BOX(hbox_canvas_and_controls), drawing_area, TRUE, TRUE, PIDGIN_HIG_BOX_SPACE); gtk_widget_show(drawing_area); @@ -234,19 +234,19 @@ /* Create vertical box to contain the controls */ vbox_controls = gtk_vbox_new(FALSE, 0); gtk_box_pack_start(GTK_BOX(hbox_canvas_and_controls), - vbox_controls, FALSE, FALSE, GAIM_HIG_BOX_SPACE); + vbox_controls, FALSE, FALSE, PIDGIN_HIG_BOX_SPACE); gtk_widget_show(vbox_controls); /* Add a clear button */ clear_button = gtk_button_new_from_stock(GTK_STOCK_CLEAR); - gtk_box_pack_start(GTK_BOX(vbox_controls), clear_button, FALSE, FALSE, GAIM_HIG_BOX_SPACE); + gtk_box_pack_start(GTK_BOX(vbox_controls), clear_button, FALSE, FALSE, PIDGIN_HIG_BOX_SPACE); gtk_widget_show(clear_button); g_signal_connect(G_OBJECT(clear_button), "clicked", G_CALLBACK(pidgin_whiteboard_button_clear_press), gtkwb); /* Add a save button */ save_button = gtk_button_new_from_stock(GTK_STOCK_SAVE); - gtk_box_pack_start(GTK_BOX(vbox_controls), save_button, FALSE, FALSE, GAIM_HIG_BOX_SPACE); + gtk_box_pack_start(GTK_BOX(vbox_controls), save_button, FALSE, FALSE, PIDGIN_HIG_BOX_SPACE); gtk_widget_show(save_button); g_signal_connect(G_OBJECT(save_button), "clicked", @@ -254,7 +254,7 @@ /* Add a color selector */ color_button = gtk_button_new_from_stock(GTK_STOCK_SELECT_COLOR); - gtk_box_pack_start(GTK_BOX(vbox_controls), color_button, FALSE, FALSE, GAIM_HIG_BOX_SPACE); + gtk_box_pack_start(GTK_BOX(vbox_controls), color_button, FALSE, FALSE, PIDGIN_HIG_BOX_SPACE); gtk_widget_show(color_button); g_signal_connect(G_OBJECT(color_button), "clicked", G_CALLBACK(color_select_dialog), gtkwb);
--- a/pidgin/pidgin.h Sun Mar 18 21:12:40 2007 +0000 +++ b/pidgin/pidgin.h Mon Mar 19 06:01:29 2007 +0000 @@ -42,9 +42,9 @@ #define PIDGIN_UI "pidgin" #ifndef _WIN32 -# define GAIM_ALERT_TITLE "" +# define PIDGIN_ALERT_TITLE "" #else -# define GAIM_ALERT_TITLE PIDGIN_NAME +# define PIDGIN_ALERT_TITLE PIDGIN_NAME #endif /* @@ -78,15 +78,15 @@ * Spacings between components, as defined by the * GNOME Human Interface Guidelines. */ -#define GAIM_HIG_CAT_SPACE 18 -#define GAIM_HIG_BORDER 12 -#define GAIM_HIG_BOX_SPACE 6 +#define PIDGIN_HIG_CAT_SPACE 18 +#define PIDGIN_HIG_BORDER 12 +#define PIDGIN_HIG_BOX_SPACE 6 /* * See GNOME bug #307304 for some discussion about the invisible * character. 0x25cf is a good choice, too. */ -#define GAIM_INVISIBLE_CHAR (gunichar)0x2022 +#define PIDGIN_INVISIBLE_CHAR (gunichar)0x2022 #endif /* _PIDGIN_H_ */
--- a/pidgin/plugins/convcolors.c Sun Mar 18 21:12:40 2007 +0000 +++ b/pidgin/plugins/convcolors.c Mon Mar 19 06:01:29 2007 +0000 @@ -259,8 +259,8 @@ GtkWidget *frame; int i; - ret = gtk_vbox_new(FALSE, GAIM_HIG_CAT_SPACE); - gtk_container_set_border_width(GTK_CONTAINER(ret), GAIM_HIG_BORDER); + ret = gtk_vbox_new(FALSE, PIDGIN_HIG_CAT_SPACE); + gtk_container_set_border_width(GTK_CONTAINER(ret), PIDGIN_HIG_BORDER); for (i = 0; formats[i].prefix; i++) { @@ -272,10 +272,10 @@ f = gaim_prefs_get_int(tmp); frame = pidgin_make_frame(ret, _(formats[i].text)); - vbox = gtk_vbox_new(FALSE, GAIM_HIG_BOX_SPACE); + vbox = gtk_vbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); gtk_box_pack_start(GTK_BOX(frame), vbox, FALSE, FALSE, 0); - hbox = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE); + hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); button = pidgin_pixbuf_button_from_stock(" Color", GTK_STOCK_SELECT_COLOR,
--- a/pidgin/plugins/gaimrc.c Sun Mar 18 21:12:40 2007 +0000 +++ b/pidgin/plugins/gaimrc.c Mon Mar 19 06:01:29 2007 +0000 @@ -439,15 +439,15 @@ GtkSizeGroup *labelsg = NULL, *widgetsg = NULL; GtkWidget *ret = NULL, *frame = NULL, *hbox = NULL, *vbox = NULL; - ret = gtk_vbox_new(FALSE, GAIM_HIG_CAT_SPACE); - gtk_container_set_border_width(GTK_CONTAINER(ret), GAIM_HIG_BORDER); + ret = gtk_vbox_new(FALSE, PIDGIN_HIG_CAT_SPACE); + gtk_container_set_border_width(GTK_CONTAINER(ret), PIDGIN_HIG_BORDER); labelsg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); widgetsg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); frame = pidgin_make_frame(ret, _("General")); /* interface font */ - hbox = gtk_hbox_new(FALSE, GAIM_HIG_CAT_SPACE); + hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE); gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0); check = pidgin_prefs_checkbox(_("GTK+ Interface Font"), @@ -467,7 +467,7 @@ G_CALLBACK(gaimrc_set_font_special), NULL); /* key theme name */ - hbox = gtk_hbox_new(FALSE, GAIM_HIG_CAT_SPACE); + hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE); gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0); check = pidgin_prefs_checkbox(_("GTK+ Text Shortcut Theme"), @@ -487,7 +487,7 @@ G_CALLBACK(pidgin_toggle_sensitive), widget); for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) { - hbox = gtk_hbox_new(FALSE, GAIM_HIG_CAT_SPACE); + hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE); gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0); check = pidgin_prefs_checkbox(_(widget_bool_names[i]), @@ -508,7 +508,7 @@ frame = pidgin_make_frame(ret, _("Interface colors")); /* imhtml stuff */ for (i = 0; i < G_N_ELEMENTS(color_prefs); i++) { - hbox = gtk_hbox_new(FALSE, GAIM_HIG_CAT_SPACE); + hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE); gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0); check = pidgin_prefs_checkbox(_(color_names[i]), @@ -532,7 +532,7 @@ frame = pidgin_make_frame(ret, _("Widget Sizes")); /* widget size stuff */ for (i = 0; i < G_N_ELEMENTS(widget_size_prefs); i++) { - hbox = gtk_hbox_new(FALSE, GAIM_HIG_CAT_SPACE); + hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE); gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0); check = pidgin_prefs_checkbox(_(widget_size_names[i]), @@ -553,7 +553,7 @@ frame = pidgin_make_frame(ret, _("Fonts")); /* imhtml font stuff */ for (i = 0; i < G_N_ELEMENTS(font_prefs); i++) { - hbox = gtk_hbox_new(FALSE, GAIM_HIG_CAT_SPACE); + hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE); gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0); check = pidgin_prefs_checkbox(_(font_names[i]), @@ -575,7 +575,7 @@ frame = pidgin_make_frame(ret, _("Tools")); - vbox = gtk_vbox_new(FALSE, GAIM_HIG_CAT_SPACE); + vbox = gtk_vbox_new(FALSE, PIDGIN_HIG_CAT_SPACE); gtk_box_pack_start(GTK_BOX(frame), vbox, FALSE, FALSE, 0); tmp = g_strdup_printf(_("Write settings to %s%sgtkrc-2.0"), gaim_user_dir(), G_DIR_SEPARATOR_S);
--- a/pidgin/plugins/spellchk.c Sun Mar 18 21:12:40 2007 +0000 +++ b/pidgin/plugins/spellchk.c Mon Mar 19 06:01:29 2007 +0000 @@ -2174,8 +2174,8 @@ GtkWidget *hbox2; GtkWidget *vbox3; - ret = gtk_vbox_new(FALSE, GAIM_HIG_CAT_SPACE); - gtk_container_set_border_width (GTK_CONTAINER(ret), GAIM_HIG_BORDER); + ret = gtk_vbox_new(FALSE, PIDGIN_HIG_CAT_SPACE); + gtk_container_set_border_width (GTK_CONTAINER(ret), PIDGIN_HIG_BORDER); vbox = pidgin_make_frame(ret, _("Text Replacements")); gtk_container_set_border_width(GTK_CONTAINER(vbox), 4); @@ -2268,10 +2268,10 @@ vbox = pidgin_make_frame(ret, _("Add a new text replacement")); - hbox = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE); + hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 0); gtk_widget_show(hbox); - vbox2 = gtk_vbox_new(FALSE, GAIM_HIG_BOX_SPACE); + vbox2 = gtk_vbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); gtk_box_pack_start(GTK_BOX(hbox), vbox2, TRUE, TRUE, 0); gtk_widget_show(vbox2);