Revision fab2ec4334c8c32a4a33cf74896fdbf48dc76365
sadrul at pidgin.im
sadrul at pidgin.im
Mon Mar 19 02:19:20 EDT 2007
o -----------------------------------------------------------------
|\ Revision: fab2ec4334c8c32a4a33cf74896fdbf48dc76365
| | Ancestor: 9d227438376255715d0d778ce0a57734aed4c99a
| | Ancestor: ebb919dd47f8edc3b1b82fdbc2d2a7764bc9ab6f
| | Author: sadrul at pidgin.im
| | Date: 2007-03-19T06:35:51
| | Branch: im.pidgin.pidgin
| |
| | Renamed entries:
| | pidgin/gaimcombobox.c to pidgin/pidgincombobox.c
| | pidgin/gaimcombobox.h to pidgin/pidgincombobox.h
| | pidgin/gaimstock.c to pidgin/pidginstock.c
| | pidgin/gaimstock.h to pidgin/pidginstock.h
| | Modified files:
| | finch/gntrequest.c libpurple/connection.c
| | libpurple/dnsquery.c libpurple/dnssrv.c pidgin/Makefile.am
| | pidgin/gtkaccount.c pidgin/gtkblist.c
| | pidgin/gtkcellrendererexpander.c
| | pidgin/gtkcellrendererexpander.h
| | pidgin/gtkcellrendererprogress.c
| | pidgin/gtkcellrendererprogress.h pidgin/gtkconn.c
| | pidgin/gtkconv.c pidgin/gtkconv.h pidgin/gtkconvwin.h
| | pidgin/gtkdebug.c pidgin/gtkdialogs.c pidgin/gtkdnd-hints.h
| | pidgin/gtkdocklet-x11.c pidgin/gtkdocklet.c pidgin/gtkft.c
| | pidgin/gtkimhtmltoolbar.c pidgin/gtklog.c pidgin/gtkmain.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/pidgincombobox.c pidgin/pidgincombobox.h
| | pidgin/pidginstock.c pidgin/plugins/convcolors.c
| | pidgin/plugins/gaimrc.c pidgin/plugins/spellchk.c
| | po/POTFILES.in
| |
| | ChangeLog:
| |
| | merge of '9d227438376255715d0d778ce0a57734aed4c99a'
| | and 'ebb919dd47f8edc3b1b82fdbc2d2a7764bc9ab6f'
| |
| | ============================================================
| | --- pidgin/Makefile.am 0cf94bf822b89c61670c73698f13490fe2c6d408
| | +++ pidgin/Makefile.am d042b3f488b5aea66655febe502b40c8f8901cb2
| | @@ -69,8 +69,8 @@ pidgin_SOURCES = \
| |
| | pidgin_SOURCES = \
| | eggtrayicon.c \
| | - gaimcombobox.c \
| | - gaimstock.c \
| | + pidgincombobox.c \
| | + pidginstock.c \
| | gtkaccount.c \
| | gtkblist.c \
| | gtkcelllayout.c \
| | @@ -123,7 +123,7 @@ pidgin_headers = \
| | gtkcellviewmenuitem.h \
| | gtkcellview.h \
| | gtkcellviewmenuitem.h \
| | - gaimcombobox.h \
| | + pidgincombobox.h \
| | gtkconn.h \
| | gtkconv.h \
| | gtkconvwin.h \
| | @@ -154,7 +154,7 @@ pidgin_headers = \
| | gtksound.h \
| | gtksourceiter.h \
| | gtkstatusbox.h \
| | - gaimstock.h \
| | + pidginstock.h \
| | gtkthemes.h \
| | gtkutils.h \
| | gtkwhiteboard.h \
| | ============================================================
| | --- pidgin/gtkaccount.c e942a82d5dd4cb21858e0681d1714e67c1909629
| | +++ pidgin/gtkaccount.c 8467ac0de9f7ffaa7f76e7b539db53c15f591e00
| | @@ -44,7 +44,7 @@
| | #include "gtkdialogs.h"
| | #include "gtkutils.h"
| | #include "gtkstatusbox.h"
| | -#include "gaimstock.h"
| | +#include "pidginstock.h"
| |
| | enum
| | {
| | @@ -177,7 +177,7 @@ add_pref_box(AccountPrefsDialog *dialog,
| | 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 @@ add_pref_box(AccountPrefsDialog *dialog,
| | 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 @@ add_login_options(AccountPrefsDialog *di
| | 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 @@ add_login_options(AccountPrefsDialog *di
| | 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 @@ add_user_options(AccountPrefsDialog *dia
| | 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 @@ add_user_options(AccountPrefsDialog *dia
| | 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 @@ add_user_options(AccountPrefsDialog *dia
| | 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 @@ add_protocol_options(AccountPrefsDialog
| | 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 @@ add_protocol_options(AccountPrefsDialog
| | {
| | 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 @@ add_proxy_options(AccountPrefsDialog *di
| | 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_proxy_options(AccountPrefsDialog *di
| | 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 @@ add_proxy_options(AccountPrefsDialog *di
| | 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 @@ pidgin_account_dialog_show(PidginAccount
| |
| | 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 @@ pidgin_account_dialog_show(PidginAccount
| | 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 @@ pidgin_account_dialog_show(PidginAccount
| | 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 @@ pidgin_account_dialog_show(PidginAccount
| |
| | /* 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 @@ pidgin_accounts_window_show(void)
| | 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 @@ pidgin_accounts_window_show(void)
| | 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 @@ pidgin_accounts_window_show(void)
| |
| | /* 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);
| | ============================================================
| | --- pidgin/gtkblist.c c2576a80f5b174e961f4a72ece19613d62ebcd68
| | +++ pidgin/gtkblist.c 622f371f85c492a590fd048d782e37936826a9d2
| | @@ -36,7 +36,7 @@
| | #include "plugin.h"
| | #include "request.h"
| | #include "signals.h"
| | -#include "gaimstock.h"
| | +#include "pidginstock.h"
| | #include "util.h"
| |
| | #include "gtkaccount.h"
| | @@ -128,12 +128,12 @@ static void pidgin_blist_update_contact(
| | 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 @@ rebuild_joinchat_entries(PidginJoinChatD
| |
| | 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 @@ rebuild_joinchat_entries(PidginJoinChatD
| | {
| | 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 @@ pidgin_blist_joinchat_show(void)
| | 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 @@ pidgin_blist_joinchat_show(void)
| | 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 @@ static void gtk_blist_row_expanded_cb(Gt
| | 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 @@ static void gtk_blist_row_collapsed_cb(G
| | 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 @@ static struct tooltip_data * create_tip_
| | 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 @@ static GtkItemFactoryEntry blist_menu[]
| | * 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 @@ create_connection_error_buttons(gpointer
| | 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 @@ create_connection_error_buttons(gpointer
| | 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 @@ kiosk_page()
| | 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 @@ kiosk_page()
| | 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 @@ static void pidgin_blist_update_group(Ga
| | 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 void pidgin_blist_update_group(Ga
| | }
| | }
| |
| | -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 @@ pidgin_blist_request_add_buddy(GaimAccou
| | 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 @@ pidgin_blist_request_add_buddy(GaimAccou
| | 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 @@ rebuild_addchat_entries(PidginAddChatDat
| | {
| | 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 @@ pidgin_blist_request_add_chat(GaimAccoun
| | 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);
| | ============================================================
| | --- pidgin/gtkcellrendererexpander.c a076d30036a1db25743c40113d608d3b81d7d5b2
| | +++ pidgin/gtkcellrendererexpander.c 3563deab80ad7cac681d1d3f4385646d5d6e4f11
| | @@ -185,7 +185,7 @@ GtkCellRenderer *pidgin_cell_renderer_ex
| |
| | GtkCellRenderer *pidgin_cell_renderer_expander_new(void)
| | {
| | - return g_object_new(GAIM_TYPE_GTK_CELL_RENDERER_EXPANDER, NULL);
| | + return g_object_new(PIDGIN_TYPE_GTK_CELL_RENDERER_EXPANDER, NULL);
| | }
| |
| | static void pidgin_cell_renderer_expander_get_size (GtkCellRenderer *cell,
| | ============================================================
| | --- pidgin/gtkcellrendererexpander.h 9416d26755a775d226761158e85942fc3696bbcd
| | +++ pidgin/gtkcellrendererexpander.h 962fd356df63f0883dfcec7267fda8c75197629e
| | @@ -28,12 +28,12 @@ extern "C" {
| | #endif /* __cplusplus */
| |
| |
| | -#define GAIM_TYPE_GTK_CELL_RENDERER_EXPANDER (pidgin_cell_renderer_expander_get_type())
| | -#define PIDGIN_CELL_RENDERER_EXPANDER(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GAIM_TYPE_GTK_CELL_RENDERER_EXPANDER, PidginCellRendererExpander))
| | +#define PIDGIN_TYPE_GTK_CELL_RENDERER_EXPANDER (pidgin_cell_renderer_expander_get_type())
| | +#define PIDGIN_CELL_RENDERER_EXPANDER(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), PIDGIN_TYPE_GTK_CELL_RENDERER_EXPANDER, PidginCellRendererExpander))
| | #define PIDGIN_CELL_RENDERER_EXPANDER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GAIM_TYPE_GTK_CELL_RENDERER_EXPANDER, PidginCellRendererExpanderClass))
| | -#define GAIM_IS_GTK_CELL_RENDERER_EXPANDER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GAIM_TYPE_GTK_CELL_RENDERER_EXPANDER))
| | -#define GAIM_IS_GTK_CELL_RENDERER_EXPANDER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GAIM_TYPE_GTK_CELL_RENDERER_EXPANDER))
| | -#define PIDGIN_CELL_RENDERER_EXPANDER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GAIM_TYPE_GTK_CELL_RENDERER_EXPANDER, PidginCellRendererExpanderClass))
| | +#define PIDGIN_IS_GTK_CELL_RENDERER_EXPANDER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PIDGIN_TYPE_GTK_CELL_RENDERER_EXPANDER))
| | +#define PIDGIN_IS_GTK_CELL_RENDERER_EXPANDER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PIDGIN_TYPE_GTK_CELL_RENDERER_EXPANDER))
| | +#define PIDGIN_CELL_RENDERER_EXPANDER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PIDGIN_TYPE_GTK_CELL_RENDERER_EXPANDER, PidginCellRendererExpanderClass))
| |
| | typedef struct _PidginCellRendererExpander PidginCellRendererExpander;
| | typedef struct _PidginCellRendererExpanderClass PidginCellRendererExpanderClass;
| | ============================================================
| | --- pidgin/gtkcellrendererprogress.c 3c348c3463abf0bbbfcb0acea4333ec336e2b664
| | +++ pidgin/gtkcellrendererprogress.c b3708822cf11ae38b02e8f3e36011ae7708bc6b6
| | @@ -214,7 +214,7 @@ GtkCellRenderer *pidgin_cell_renderer_pr
| |
| | GtkCellRenderer *pidgin_cell_renderer_progress_new(void)
| | {
| | - return g_object_new(GAIM_TYPE_GTK_CELL_RENDERER_PROGRESS, NULL);
| | + return g_object_new(PIDGIN_TYPE_GTK_CELL_RENDERER_PROGRESS, NULL);
| | }
| |
| | static void pidgin_cell_renderer_progress_get_size (GtkCellRenderer *cell,
| | ============================================================
| | --- pidgin/gtkcellrendererprogress.h 6b25c6f59033b214026911c7f1bf6b5c0bb81099
| | +++ pidgin/gtkcellrendererprogress.h 5a0a566cde8286f5f8d862d40bcc81871cca2851
| | @@ -28,12 +28,12 @@ extern "C" {
| | #endif /* __cplusplus */
| |
| |
| | -#define GAIM_TYPE_GTK_CELL_RENDERER_PROGRESS (pidgin_cell_renderer_progress_get_type())
| | -#define PIDGIN_CELL_RENDERER_PROGRESS(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GAIM_TYPE_GTK_CELL_RENDERER_PROGRESS, PidginCellRendererProgress))
| | -#define PIDGIN_CELL_RENDERER_PROGRESS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GAIM_TYPE_GTK_CELL_RENDERER_PROGRESS, PidginCellRendererProgressClass))
| | -#define GAIM_IS_GTK_CELL_PROGRESS_PROGRESS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GAIM_TYPE_GTK_CELL_RENDERER_PROGRESS))
| | -#define GAIM_IS_GTK_CELL_PROGRESS_PROGRESS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GAIM_TYPE_GTK_CELL_RENDERER_PROGRESS))
| | -#define PIDGIN_CELL_RENDERER_PROGRESS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GAIM_TYPE_GTK_CELL_RENDERER_PROGRESS, PidginCellRendererProgressClass))
| | +#define PIDGIN_TYPE_GTK_CELL_RENDERER_PROGRESS (pidgin_cell_renderer_progress_get_type())
| | +#define PIDGIN_CELL_RENDERER_PROGRESS(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), PIDGIN_TYPE_GTK_CELL_RENDERER_PROGRESS, PidginCellRendererProgress))
| | +#define PIDGIN_CELL_RENDERER_PROGRESS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PIDGIN_TYPE_GTK_CELL_RENDERER_PROGRESS, PidginCellRendererProgressClass))
| | +#define PIDGIN_IS_GTK_CELL_PROGRESS_PROGRESS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PIDGIN_TYPE_GTK_CELL_RENDERER_PROGRESS))
| | +#define PIDGIN_IS_GTK_CELL_PROGRESS_PROGRESS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PIDGIN_TYPE_GTK_CELL_RENDERER_PROGRESS))
| | +#define PIDGIN_CELL_RENDERER_PROGRESS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PIDGIN_TYPE_GTK_CELL_RENDERER_PROGRESS, PidginCellRendererProgressClass))
| |
| | typedef struct _PidginCellRendererProgress PidginCellRendererProgress;
| | typedef struct _PidginCellRendererProgressClass PidginCellRendererProgressClass;
| | ============================================================
| | --- pidgin/gtkconn.c a3bde310a0097818e50abbcd8867e18260d297e5
| | +++ pidgin/gtkconn.c 5a32ef8bc8aae29ec4252fd8d0d91bc55f75a7f2
| | @@ -33,7 +33,7 @@
| | #include "gtkconn.h"
| | #include "gtkdialogs.h"
| | #include "gtkstatusbox.h"
| | -#include "gaimstock.h"
| | +#include "pidginstock.h"
| | #include "gtkutils.h"
| | #include "util.h"
| |
| | @@ -45,12 +45,12 @@ typedef struct {
| | typedef struct {
| | int delay;
| | guint timeout;
| | -} GaimAutoRecon;
| | +} PidginAutoRecon;
| |
| | /**
| | * Contains accounts that are auto-reconnecting.
| | * The key is a pointer to the GaimAccount and the
| | - * value is a pointer to a GaimAutoRecon.
| | + * value is a pointer to a PidginAutoRecon.
| | */
| | static GHashTable *hash = NULL;
| |
| | @@ -102,7 +102,7 @@ free_auto_recon(gpointer data)
| | static void
| | free_auto_recon(gpointer data)
| | {
| | - GaimAutoRecon *info = data;
| | + PidginAutoRecon *info = data;
| |
| | if (info->timeout != 0)
| | g_source_remove(info->timeout);
| | @@ -114,7 +114,7 @@ do_signon(gpointer data)
| | do_signon(gpointer data)
| | {
| | GaimAccount *account = data;
| | - GaimAutoRecon *info;
| | + PidginAutoRecon *info;
| | GaimStatus *status;
| |
| | gaim_debug_info("autorecon", "do_signon called\n");
| | @@ -139,7 +139,7 @@ pidgin_connection_report_disconnect(Gaim
| | pidgin_connection_report_disconnect(GaimConnection *gc, const char *text)
| | {
| | GaimAccount *account = NULL;
| | - GaimAutoRecon *info;
| | + PidginAutoRecon *info;
| |
| | account = gaim_connection_get_account(gc);
| | info = g_hash_table_lookup(hash, account);
| | @@ -147,7 +147,7 @@ pidgin_connection_report_disconnect(Gaim
| | pidgin_blist_update_account_error_state(account, text);
| | if (!gc->wants_to_die) {
| | if (info == NULL) {
| | - info = g_new0(GaimAutoRecon, 1);
| | + info = g_new0(PidginAutoRecon, 1);
| | g_hash_table_insert(hash, account, info);
| | info->delay = g_random_int_range(INITIAL_RECON_DELAY_MIN, INITIAL_RECON_DELAY_MAX);
| | } else {
| | ============================================================
| | --- pidgin/gtkconv.c cde9550569da1f9500cb6b8b49edf8fd6c64b8dc
| | +++ pidgin/gtkconv.c 7b62a87291f47a99b33b60dc77c180198c8ed151
| | @@ -64,7 +64,7 @@
| | #include "gtkprivacy.h"
| | #include "gtkthemes.h"
| | #include "gtkutils.h"
| | -#include "gaimstock.h"
| | +#include "pidginstock.h"
| |
| | #include "gtknickcolors.h"
| |
| | @@ -166,7 +166,7 @@ static void pidgin_conv_updated(GaimConv
| | 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 @@ invite_cb(GtkWidget *widget, PidginConve
| |
| | 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 @@ invite_cb(GtkWidget *widget, PidginConve
| | /* 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 @@ invite_cb(GtkWidget *widget, PidginConve
| | 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 @@ menu_find_cb(gpointer data, guint action
| | 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);
| | + GTK_CONTAINER(GTK_DIALOG(gtkwin->dialogs.search)->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(gtkwin->dialogs.search)->vbox),
| | hbox);
| | gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0);
| | @@ -2685,7 +2685,7 @@ pidgin_conversations_find_unseen_list(Ga
| |
| | GList *
| | pidgin_conversations_find_unseen_list(GaimConversationType type,
| | - GaimUnseenState min_state,
| | + PidginUnseenState min_state,
| | gboolean hidden_only,
| | guint max_count)
| | {
| | @@ -4103,10 +4103,10 @@ static void resize_imhtml_cb(PidginConve
| | 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 @@ setup_chat_pane(PidginConversation *gtkc
| | 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 @@ setup_chat_pane(PidginConversation *gtkc
| | 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 @@ setup_chat_pane(PidginConversation *gtkc
| | 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 @@ setup_im_pane(PidginConversation *gtkcon
| | 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 @@ setup_im_pane(PidginConversation *gtkcon
| | 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 @@ private_gtkconv_new(GaimConversation *co
| | 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 @@ pidgin_conv_write_conv(GaimConversation
| | /* 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 @@ pidgin_conv_get_tab_at_xy(PidginWindow *
| | 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 @@ pidgin_conv_get_tab_at_xy(PidginWindow *
| | 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,
| | 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;
| | @@ -7089,7 +7089,7 @@ pidgin_conversations_uninit(void)
| | #include "gtkprefs.h"
| | #include "gtkprivacy.h"
| | #include "gtkutils.h"
| | -#include "gaimstock.h"
| | +#include "pidginstock.h"
| | #include "gtkimhtml.h"
| | #include "gtkimhtmltoolbar.h"
| |
| | @@ -7189,7 +7189,7 @@ static void
| | }
| |
| | 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 @@ pidgin_conv_window_add_gtkconv(PidginWin
| | 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 @@ typedef struct
| | {
| | 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 @@ add_conv_placement_fnc(const char *id, c
| |
| | static void
| | add_conv_placement_fnc(const char *id, const char *name,
| | - GaimConvPlacementFunc fnc)
| | + PidginConvPlacementFunc fnc)
| | {
| | ConvPlacementData *data;
| |
| | @@ -8501,7 +8501,7 @@ pidgin_conv_placement_add_fnc(const char
| |
| | 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 @@ pidgin_conv_placement_get_name(const cha
| | return data->name;
| | }
| |
| | -GaimConvPlacementFunc
| | +PidginConvPlacementFunc
| | pidgin_conv_placement_get_fnc(const char *id)
| | {
| | ConvPlacementData *data;
| | @@ -8558,7 +8558,7 @@ void
| | }
| |
| | 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 @@ pidgin_conv_placement_set_current_func(G
| | place_conv = NULL;
| | }
| |
| | -GaimConvPlacementFunc
| | +PidginConvPlacementFunc
| | pidgin_conv_placement_get_current_func(void)
| | {
| | return place_conv;
| | ============================================================
| | --- pidgin/gtkconv.h e55e0b5cf0b747264429ff8231dbb561691a11da
| | +++ pidgin/gtkconv.h 602ef4e177d18f53b214dd1ba8e0df2df5d632ce
| | @@ -39,7 +39,7 @@ typedef enum
| | 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 @@ struct _PidginConversation
| |
| | GtkWidget *toolbar;
| |
| | - GaimUnseenState unseen_state;
| | + PidginUnseenState unseen_state;
| | guint unseen_count;
| |
| | union
| | @@ -212,7 +212,7 @@ pidgin_conversations_find_unseen_list(Ga
| | */
| | GList *
| | pidgin_conversations_find_unseen_list(GaimConversationType type,
| | - GaimUnseenState min_state,
| | + PidginUnseenState min_state,
| | gboolean hidden_only,
| | guint max_count);
| |
| | ============================================================
| | --- pidgin/gtkconvwin.h e1cad391b03ea9edcd64c2f11044a9c227c168d3
| | +++ pidgin/gtkconvwin.h 34bd4ccad953c6b2b04b02d73a1b922f1e91c2c7
| | @@ -132,15 +132,15 @@ PidginWindow *pidgin_conv_window_last_wi
| | **************************************************************************/
| | /*@{*/
| |
| | -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);
| |
| | /*@}*/
| | ============================================================
| | --- pidgin/gtkdebug.c bd2e4009284a26d1fadee0da11a164c2bf9f6574
| | +++ pidgin/gtkdebug.c b67a6bec3899b2fb83b011bab5e979a359e47b93
| | @@ -34,7 +34,7 @@
| | #include "gtkdialogs.h"
| | #include "gtkimhtml.h"
| | #include "gtkutils.h"
| | -#include "gaimstock.h"
| | +#include "pidginstock.h"
| |
| | #ifdef HAVE_REGEX_H
| | # include <regex.h>
| | @@ -172,14 +172,14 @@ find_cb(GtkWidget *w, DebugWindow *win)
| | 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,
| | ============================================================
| | --- pidgin/gtkdialogs.c 2f931068a07465e51dd4f1e5e11ff997a9b17519
| | +++ pidgin/gtkdialogs.c 57ea8d167cd5b83ae7605dfc06b90727b2420ea2
| | @@ -37,13 +37,13 @@
| | #include "gtkimhtmltoolbar.h"
| | #include "gtklog.h"
| | #include "gtkutils.h"
| | -#include "gaimstock.h"
| | +#include "pidginstock.h"
| |
| | static GList *dialogwindows = NULL;
| |
| | static GtkWidget *about = NULL;
| |
| | -struct _GaimGroupMergeObject {
| | +struct _PidginGroupMergeObject {
| | GaimGroup* parent;
| | char *new_name;
| | };
| | @@ -321,11 +321,11 @@ void pidgindialogs_about()
| | 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 @@ pidgindialogs_ee(const char *ee)
| | 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 @@ pidgindialogs_remove_contact(GaimContact
| | }
| | }
| |
| | -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 *so
| | 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 @@ pidgindialogs_merge_groups(GaimGroup *so
| | _("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);
| |
| | ============================================================
| | --- pidgin/gtkdnd-hints.h 6ceabfda7742e51404058840899ec46c81bf8062
| | +++ pidgin/gtkdnd-hints.h 70dc117bc3c7742158f26df474a594efec29a8dd
| | @@ -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(DndHintWind
| | void dnd_hints_show_relative(DndHintWindowId id, GtkWidget *widget,
| | DndHintPosition horiz, DndHintPosition vert);
| |
| | +#endif /* _PIDGIN_DND_HINTS_H_ */
| | -#endif /* _GAIM_DND_HINTS_H_ */
| | ============================================================
| | --- pidgin/gtkdocklet-x11.c b3b38dd36d790285ba71d22dd7690338f07ca13e
| | +++ pidgin/gtkdocklet-x11.c 9d297be6533dc08b32ace156cecf197961fbce95
| | @@ -25,7 +25,7 @@
| | #include "internal.h"
| | #include "pidgin.h"
| | #include "debug.h"
| | -#include "gaimstock.h"
| | +#include "pidginstock.h"
| |
| | #include "gtkdialogs.h"
| |
| | ============================================================
| | --- pidgin/gtkdocklet.c e0369f03e1ce1f1e0da761cc41333982a5a590e0
| | +++ pidgin/gtkdocklet.c 974ba8132041660a193aad1032cbac752b35cbe2
| | @@ -39,7 +39,7 @@
| | #include "gtksavedstatuses.h"
| | #include "gtksound.h"
| | #include "gtkutils.h"
| | -#include "gaimstock.h"
| | +#include "pidginstock.h"
| | #include "gtkdocklet.h"
| | #include "gtkdialogs.h"
| |
| | @@ -244,7 +244,7 @@ static void
| | **************************************************************************/
| | #if 0
| | static void
| | -gaim_quit_cb()
| | +pidgin_quit_cb()
| | {
| | /* TODO: confirm quit while pending */
| | }
| | @@ -409,7 +409,7 @@ static GtkWidget *
| | }
| |
| | 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 @@ docklet_status_submenu()
| | 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 @@ docklet_status_submenu()
| | {
| | 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 @@ docklet_status_submenu()
| |
| | 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;
| | }
| | ============================================================
| | --- pidgin/gtkft.c a257cbf004485ad6ee3b35e7a3537d13ad2cdc00
| | +++ pidgin/gtkft.c 0507e836549a8c82708a4c95ac4164903f409802
| | @@ -35,7 +35,7 @@
| | #include "gtkft.h"
| | #include "prefs.h"
| | #include "gtkexpander.h"
| | -#include "gaimstock.h"
| | +#include "pidginstock.h"
| | #include "gtkutils.h"
| |
| | #define PIDGINXFER(xfer) \
| | @@ -703,8 +703,8 @@ make_info_table(PidginXferDialog *dialog
| |
| | /* 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 @@ pidginxfer_dialog_new(void)
| | 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 @@ pidginxfer_dialog_new(void)
| |
| | /* 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);
| | ============================================================
| | --- pidgin/gtkimhtmltoolbar.c d84c3eab2623835189bd61dd7b3a1d924bb2c7d1
| | +++ pidgin/gtkimhtmltoolbar.c c794baf4f2180605ab313d6156f0522001105a67
| | @@ -29,7 +29,7 @@
| | #include "imgstore.h"
| | #include "notify.h"
| | #include "request.h"
| | -#include "gaimstock.h"
| | +#include "pidginstock.h"
| | #include "util.h"
| |
| | #include "gtkdialogs.h"
| | ============================================================
| | --- pidgin/gtklog.c bd04628a3adbf21dd8d5265009d7db6527018c44
| | +++ pidgin/gtklog.c f1b28b5685b5bd0c125edfb0f6aff7c868eb0549
| | @@ -32,7 +32,7 @@
| | #include "request.h"
| | #include "util.h"
| |
| | -#include "gaimstock.h"
| | +#include "pidginstock.h"
| | #include "gtkblist.h"
| | #include "gtkimhtml.h"
| | #include "gtklog.h"
| | @@ -541,7 +541,7 @@ static PidginLogViewer *display_log_view
| | /* 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 @@ static PidginLogViewer *display_log_view
| |
| | /* 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 @@ static PidginLogViewer *display_log_view
| |
| | /* 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 @@ static PidginLogViewer *display_log_view
| | }
| |
| | /* 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 @@ static PidginLogViewer *display_log_view
| | 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);
| | ============================================================
| | --- pidgin/gtkmain.c ca9f65e8d40017baf52c5913682a045891ec1163
| | +++ pidgin/gtkmain.c 8574548d9121d59f2c053244727324c62082a13a
| | @@ -63,7 +63,7 @@
| | #include "gtksound.h"
| | #include "gtkthemes.h"
| | #include "gtkutils.h"
| | -#include "gaimstock.h"
| | +#include "pidginstock.h"
| | #include "gtkwhiteboard.h"
| |
| | #ifdef HAVE_SIGNAL_H
| | ============================================================
| | --- pidgin/gtknotify.c b67dd36f8be47b29b06cda599240e52df40aa94c
| | +++ pidgin/gtknotify.c cdae65f633115ac4312ca0c1513b42950bbae085
| | @@ -30,7 +30,7 @@
| | #include "connection.h"
| | #include "debug.h"
| | #include "prefs.h"
| | -#include "gaimstock.h"
| | +#include "pidginstock.h"
| | #include "util.h"
| |
| | #include "gtkblist.h"
| | @@ -45,7 +45,7 @@ typedef struct
| | GtkWidget *label;
| | GtkTreeIter iter;
| | int count;
| | -} GaimNotifyMailData;
| | +} PidginNotifyMailData;
| |
| | typedef struct
| | {
| | @@ -56,14 +56,14 @@ typedef struct
| | gpointer user_data;
| | GaimNotifySearchResults *results;
| |
| | -} GaimNotifySearchResultsData;
| | +} PidginNotifySearchResultsData;
| |
| | typedef struct
| | {
| | GaimNotifySearchButton *button;
| | - GaimNotifySearchResultsData *data;
| | + PidginNotifySearchResultsData *data;
| |
| | -} GaimNotifySearchResultsButtonData;
| | +} PidginNotifySearchResultsButtonData;
| |
| | enum
| | {
| | @@ -102,7 +102,7 @@ email_response_cb(GtkDialog *dlg, gint i
| | 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
| | }
| |
| | 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 @@ pidgin_notify_message(GaimNotifyMsgType
| | 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 @@ pidgin_notify_message(GaimNotifyMsgType
| | 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 @@ selection_changed_cb(GtkTreeSelection *s
| | {
| | 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_get_mail_dialog()
| | 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 @@ pidgin_notify_add_mail(GtkTreeStore *tre
| | 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 @@ pidgin_notify_add_mail(GtkTreeStore *tre
| | }
| |
| | if (new_n) {
| | - data = g_new0(GaimNotifyMailData, 1);
| | + data = g_new0(PidginNotifyMailData, 1);
| | gtk_tree_store_append(treemodel, &iter, NULL);
| | }
| |
| | @@ -457,7 +457,7 @@ pidgin_notify_emails(GaimConnection *gc,
| | 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 @@ pidgin_notify_formatted(const char *titl
| | 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(Gai
| | 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 @@ pidgin_notify_searchresults(GaimConnecti
| | 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 @@ pidgin_notify_searchresults(GaimConnecti
| | 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 @@ pidgin_notify_searchresults(GaimConnecti
| | 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 @@ pidgin_notify_searchresults(GaimConnecti
| | 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 @@ pidgin_close_notify(GaimNotifyType type,
| | {
| | 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);
| | ============================================================
| | --- pidgin/gtkplugin.c 99f0bdc1dbcee5150a3196e4bc74b34a8143a259
| | +++ pidgin/gtkplugin.c 7ea5273ba6e29bfb8cf8cc5913c757546fe9a080
| | @@ -470,7 +470,7 @@ static void plugin_dialog_response_cb(Gt
| | 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);
| | ============================================================
| | --- pidgin/gtkpluginpref.c 9466da65ad5def344dc838dea001fc1b39df0015
| | +++ pidgin/gtkpluginpref.c 76737ed84d15719fb08ba364bba704160e8fb3f8
| | @@ -92,9 +92,9 @@ make_string_pref(GtkWidget *parent, Gaim
| | 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 @@ make_string_pref(GtkWidget *parent, Gaim
| | {
| | 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 @@ make_string_pref(GtkWidget *parent, Gaim
| | 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 @@ pidgin_plugin_pref_create_frame(GaimPlug
| | 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);
| | ============================================================
| | --- pidgin/gtkpounce.c bbcedc576ae474636db5e06d463fe317fb4a1f6b
| | +++ pidgin/gtkpounce.c cd174db067864ba2c88c1105eb7326b51b125575
| | @@ -39,7 +39,7 @@
| | #include "gtkblist.h"
| | #include "gtkdialogs.h"
| | #include "gtkpounce.h"
| | -#include "gaimstock.h"
| | +#include "pidginstock.h"
| | #include "gtkutils.h"
| |
| | /**
| | @@ -504,25 +504,25 @@ pidgin_pounce_editor_show(GaimAccount *a
| | (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_pounce_editor_show(GaimAccount *a
| | 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 @@ pidgin_pounce_editor_show(GaimAccount *a
| |
| | 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 @@ pidgin_pounce_editor_show(GaimAccount *a
| |
| | 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 @@ pidgin_pounce_editor_show(GaimAccount *a
| | 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 @@ pidgin_pounce_editor_show(GaimAccount *a
| |
| | 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 @@ pidgin_pounce_editor_show(GaimAccount *a
| |
| | /* 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 @@ pidgin_pounces_manager_show(void)
| | 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 @@ pidgin_pounces_manager_show(void)
| | 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 @@ pidgin_pounces_manager_show(void)
| |
| | /* 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);
| | ============================================================
| | --- pidgin/gtkprefs.c e08602bf577acc5e76282fce697fb6e411eb206d
| | +++ pidgin/gtkprefs.c 9f1049807b07155dfb1906ee52ff1c93aaf5cc0a
| | @@ -48,7 +48,7 @@
| | #include "gtksound.h"
| | #include "gtkthemes.h"
| | #include "gtkutils.h"
| | -#include "gaimstock.h"
| | +#include "pidginstock.h"
| |
| | #define PROXYHOST 0
| | #define PROXYPORT 1
| | @@ -632,8 +632,8 @@ theme_page()
| | 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 @@ interface_page()
| | 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 @@ conv_page()
| | 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 @@ network_page()
| | 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 @@ network_page()
| | 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 @@ browser_page()
| | 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 @@ logging_page()
| | 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 @@ sound_page()
| | 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 @@ sound_page()
| | 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 @@ sound_page()
| | 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 @@ sound_page()
| | 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 @@ sound_page()
| | 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 @@ away_page()
| | 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 @@ void pidgin_prefs_show(void)
| | 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 @@ void pidgin_prefs_show(void)
| |
| | /* 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);
| | ============================================================
| | --- pidgin/gtkprivacy.c 6429e9eb66396043b62eb905b3bd487fceb7b1ae
| | +++ pidgin/gtkprivacy.c e9bf03ea3432e6f1fc9a0231d9e9fafff88f0c0b
| | @@ -370,13 +370,13 @@ privacy_dialog_new(void)
| | 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 @@ privacy_dialog_new(void)
| | 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);
| |
| | ============================================================
| | --- pidgin/gtkrequest.c fa1be60a36b1f13c00c4cc56fe8bb79bb3c78b26
| | +++ pidgin/gtkrequest.c 5b1764307bfd202346a9fcec710fbbf09474b99c
| | @@ -32,7 +32,7 @@
| | #include "gtkimhtmltoolbar.h"
| | #include "gtkrequest.h"
| | #include "gtkutils.h"
| | -#include "gaimstock.h"
| | +#include "pidginstock.h"
| |
| | #include <gdk/gdkkeysyms.h>
| |
| | @@ -309,7 +309,7 @@ pidgin_request_input(const char *title,
| | 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 @@ pidgin_request_input(const char *title,
| | 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 @@ pidgin_request_input(const char *title,
| | 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 @@ pidgin_request_input(const char *title,
| | {
| | 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 @@ pidgin_request_choice(const char *title,
| | 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 @@ pidgin_request_choice(const char *title,
| | 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 @@ pidgin_request_choice(const char *title,
| |
| | 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 @@ pidgin_request_action(const char *title,
| | 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 @@ pidgin_request_action(const char *title,
| | 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 @@ create_string_field(GaimRequestField *fi
| | {
| | 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 @@ create_choice_field(GaimRequestField *fi
| | 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 @@ pidgin_request_fields(const char *title,
| | 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 @@ pidgin_request_fields(const char *title,
| | 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 @@ pidgin_request_fields(const char *title,
| | 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 @@ pidgin_request_fields(const char *title,
| | }
| |
| | 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 @@ pidgin_request_fields(const char *title,
| |
| | /* 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);
| | ============================================================
| | --- pidgin/gtkroomlist.c 67319b8b81240c2bff7300ee60aaa8cb2dc64cf4
| | +++ pidgin/gtkroomlist.c 9760af8e99c02c46394c9db83bff59228083ad8e
| | @@ -26,7 +26,7 @@
| | #include "internal.h"
| | #include "pidgin.h"
| | #include "gtkutils.h"
| | -#include "gaimstock.h"
| | +#include "pidginstock.h"
| | #include "debug.h"
| | #include "account.h"
| | #include "connection.h"
| | @@ -375,22 +375,22 @@ pidgin_roomlist_dialog_new_with_account(
| | 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 @@ pidgin_roomlist_dialog_new_with_account(
| |
| | /* 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);
| | ============================================================
| | --- pidgin/gtksavedstatuses.c c51f1e5deaf7c486f7265a0ee76e673a598e7132
| | +++ pidgin/gtksavedstatuses.c 36fbfb3195bbfac25d91f5e1080a60bb5cc2507b
| | @@ -37,7 +37,7 @@
| | #include "gtkimhtml.h"
| | #include "gtkimhtmltoolbar.h"
| | #include "gtksavedstatuses.h"
| | -#include "gaimstock.h"
| | +#include "pidginstock.h"
| | #include "gtkutils.h"
| |
| | /*
| | @@ -554,7 +554,7 @@ pidgin_status_window_show(void)
| | 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 @@ pidgin_status_window_show(void)
| | 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 @@ pidgin_status_window_show(void)
| |
| | /* 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 @@ pidgin_status_editor_show(gboolean edit,
| | 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 @@ pidgin_status_editor_show(gboolean edit,
| | 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 @@ pidgin_status_editor_show(gboolean edit,
| | 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 @@ pidgin_status_editor_show(gboolean edit,
| | 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 @@ pidgin_status_editor_show(gboolean edit,
| |
| | /* 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 @@ edit_substatus(StatusEditor *status_edit
| | 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 @@ edit_substatus(StatusEditor *status_edit
| | 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 @@ edit_substatus(StatusEditor *status_edit
| |
| | /* 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);
| |
| | ============================================================
| | --- pidgin/gtkstatusbox.c bbe7b173e9c49fa7e9367a584e6e89c1f3dfe15e
| | +++ pidgin/gtkstatusbox.c 23dec675611b09ce40eeb2322dc31755560c8160
| | @@ -50,7 +50,7 @@
| |
| | #include "pidgin.h"
| | #include "gtksavedstatuses.h"
| | -#include "gaimstock.h"
| | +#include "pidginstock.h"
| | #include "gtkstatusbox.h"
| | #include "gtkutils.h"
| |
| | @@ -2315,7 +2315,7 @@ static void update_size(PidginStatusBox
| | 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)
| | ============================================================
| | --- pidgin/gtkutils.c 9636b3fa69cef060e401ca59385974b4bc15255c
| | +++ pidgin/gtkutils.c 6fa3cbef731a99c9a55f4ae854fd0ad96e77a22f
| | @@ -57,7 +57,7 @@
| | #include "gtkdialogs.h"
| | #include "gtkimhtml.h"
| | #include "gtkimhtmltoolbar.h"
| | -#include "gaimstock.h"
| | +#include "pidginstock.h"
| | #include "gtkthemes.h"
| | #include "gtkutils.h"
| |
| | @@ -400,7 +400,7 @@ pidgin_make_frame(GtkWidget *parent, con
| | 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 @@ pidgin_make_frame(GtkWidget *parent, con
| | 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 @@ pidgin_make_frame(GtkWidget *parent, con
| | 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 @@ GtkWidget *pidgin_buddy_icon_chooser_new
| | 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 @@ void *pidgin_make_mini_dialog(GaimConnec
| | 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 @@ void *pidgin_make_mini_dialog(GaimConnec
| | 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);
| | ============================================================
| | --- pidgin/gtkwhiteboard.c 4041efda1d9a429522bfc38756a39f664866bfdb
| | +++ pidgin/gtkwhiteboard.c a6c40b35749baa1c8edfd35d09b6efe005420a85
| | @@ -173,13 +173,13 @@ static void pidgin_whiteboard_create(Gai
| | /* 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 @@ static void pidgin_whiteboard_create(Gai
| | 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 @@ static void pidgin_whiteboard_create(Gai
| | /* 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 @@ static void pidgin_whiteboard_create(Gai
| |
| | /* 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);
| | ============================================================
| | --- pidgin/pidgin.h 3b17d59df00c402cda71a66e216cafe917c7075a
| | +++ pidgin/pidgin.h 451d84b2a475c9bef34d0b16fb60bb64f32bb8bd
| | @@ -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_ */
| |
| | ============================================================
| | --- pidgin/gaimcombobox.c 93c0bfea1c5b8cfff38e3129801d810b27ee6951
| | +++ pidgin/pidgincombobox.c 84a541a014ed1bcfdb786f5162727809659b89fa
| | @@ -22,7 +22,7 @@
| | */
| | #include <gtk/gtkversion.h>
| | #if !GTK_CHECK_VERSION(2,6,0)
| | -#include "gaimcombobox.h"
| | +#include "pidgincombobox.h"
| |
| | #if !GTK_CHECK_VERSION(2,4,0)
| | #include <gtk/gtkarrow.h>
| | ============================================================
| | --- pidgin/gaimcombobox.h ae05bcbe0af1c6bbfe7743b2cff5de3ddc4c9cb8
| | +++ pidgin/pidgincombobox.h 9eb9e8a260618ae994fd10f940124970638268df
| | @@ -17,8 +17,8 @@
| | * Boston, MA 02111-1307, USA.
| | */
| |
| | -#ifndef __GAIM_COMBO_BOX_H__
| | -#define __GAIM_COMBO_BOX_H__
| | +#ifndef __PIDGIN_COMBO_BOX_H__
| | +#define __PIDGIN_COMBO_BOX_H__
| |
| | #ifndef __GTK_COMBO_BOX_H__
| | #define __GTK_COMBO_BOX_H__
| | @@ -111,4 +111,4 @@ gchar *gtk_combo_box_get_active_t
| |
| | gchar *gtk_combo_box_get_active_text (GtkComboBox *combo_box);
| |
| | +#endif /* __PIDGIN_COMBOX_BOX_H__ */
| | -#endif /* __GAIM_COMBOX_BOX_H__ */
| | ============================================================
| | --- pidgin/gaimstock.c b03cd954c67bfa9f6e2e0984ede575c3f9d49502
| | +++ pidgin/pidginstock.c eb147f38bc33d81d4048b70203edb28ce13d06c1
| | @@ -26,7 +26,7 @@
| | #include "internal.h"
| | #include "pidgin.h"
| |
| | -#include "gaimstock.h"
| | +#include "pidginstock.h"
| |
| | static struct StockIcon
| | {
| | ============================================================
| | --- pidgin/plugins/convcolors.c 48d8c253dcc0140fe3da563d706f36fc5cd9dfad
| | +++ pidgin/plugins/convcolors.c d698f6ea9f2c78f4041f27964043af54e30feacf
| | @@ -259,8 +259,8 @@ get_config_frame(GaimPlugin *plugin)
| | 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 @@ get_config_frame(GaimPlugin *plugin)
| | 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,
| | ============================================================
| | --- pidgin/plugins/gaimrc.c 3009c419d383c546fa0185c2eb63a6f5812e5508
| | +++ pidgin/plugins/gaimrc.c fd17c6e625cf822c1d8db29e851aab0507e3a1d3
| | @@ -439,15 +439,15 @@ gaimrc_get_config_frame(GaimPlugin *plug
| | 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 @@ gaimrc_get_config_frame(GaimPlugin *plug
| | 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 @@ gaimrc_get_config_frame(GaimPlugin *plug
| | 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 @@ gaimrc_get_config_frame(GaimPlugin *plug
| | 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 @@ gaimrc_get_config_frame(GaimPlugin *plug
| | 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 @@ gaimrc_get_config_frame(GaimPlugin *plug
| | 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 @@ gaimrc_get_config_frame(GaimPlugin *plug
| |
| | 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);
| | ============================================================
| | --- pidgin/plugins/spellchk.c ad4c0311ccf3890037e946b6b524014c6f6df6d7
| | +++ pidgin/plugins/spellchk.c 8c997a0afebbeee3a070414d4a92019c5fb582e8
| | @@ -2174,8 +2174,8 @@ get_config_frame(GaimPlugin *plugin)
| | 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 @@ get_config_frame(GaimPlugin *plugin)
| |
| | 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);
| |
| | ============================================================
| | --- finch/gntrequest.c 05cd821ee9fba343add55e6e07af7b80cadf14fa
| | +++ finch/gntrequest.c 60f55d9ee4f7bd53d999e105cc03c70f80433aeb
| | @@ -384,10 +384,21 @@ finch_request_fields(const char *title,
| | }
| | else if (type == GAIM_REQUEST_FIELD_STRING)
| | {
| | + const char *hint = gaim_request_field_get_type_hint(field);
| | GntWidget *entry = gnt_entry_new(
| | gaim_request_field_string_get_default_value(field));
| | gnt_entry_set_masked(GNT_ENTRY(entry),
| | gaim_request_field_string_is_masked(field));
| | + if (gaim_str_has_prefix(hint, "screenname")) {
| | + GaimBlistNode *node = gaim_blist_get_root();
| | + gboolean offline = gaim_str_has_suffix(hint, "all");
| | + for (; node; node = gaim_blist_node_next(node, offline)) {
| | + if (!GAIM_BLIST_NODE_IS_BUDDY(node))
| | + continue;
| | + gnt_entry_add_suggest(GNT_ENTRY(entry), gaim_buddy_get_name((GaimBuddy*)node));
| | + }
| | + gnt_entry_set_always_suggest(GNT_ENTRY(entry), TRUE);
| | + }
| | gnt_box_add_widget(GNT_BOX(hbox), entry);
| | field->ui_data = entry;
| | }
| | ============================================================
| | --- libpurple/connection.c 113fd5fc0c90e7f241cc864f86689aae6d695dab
| | +++ libpurple/connection.c a4bbab41b684b3c1bb2c36d3984509ae01e518b0
| | @@ -435,7 +435,7 @@ gaim_connection_error(GaimConnection *gc
| |
| | g_return_if_fail(gc != NULL);
| |
| | - if (text != NULL) {
| | + if (text == NULL) {
| | g_critical("gaim_connection_error: check `text != NULL' failed");
| | text = _("Unknown error");
| | }
| | ============================================================
| | --- libpurple/dnsquery.c 8407b073a205170e5140c1908471063d8603d6b2
| | +++ libpurple/dnsquery.c 6a1e86091b13194c9bb591f9793801b23ad2c256
| | @@ -758,7 +758,7 @@ resolve_host(gpointer data)
| | {
| | char message[1024];
| | g_snprintf(message, sizeof(message), _("Thread creation failure: %s"),
| | - err ? err->message : _("Unknown reason"));
| | + (err && err->message) ? err->message : _("Unknown reason"));
| | g_error_free(err);
| | gaim_dnsquery_failed(query_data, message);
| | }
| | ============================================================
| | --- libpurple/dnssrv.c 7278cff6e7a0c4991fc0199e472ca0fe8a03a801
| | +++ libpurple/dnssrv.c 22b6fe225cb519f86de90d62d8017df534ae0295
| | @@ -110,7 +110,7 @@ resolve(int in, int out)
| | #ifdef HAVE_SIGNAL_H
| | gaim_restore_default_signal_handlers();
| | #endif
| | -
| | +
| | if (read(in, query, 256) <= 0)
| | _exit(0);
| |
| | @@ -222,9 +222,9 @@ res_main_thread_cb(gpointer data)
| | GaimSrvResponse *srvres_tmp = NULL;
| | GSList *lst = query_data->results;
| |
| | - size = g_slist_length(query_data->results);
| | + size = g_slist_length(lst);
| |
| | - if(query_data->cb)
| | + if(query_data->cb && size > 0)
| | srvres_tmp = srvres = g_new0(GaimSrvResponse, size);
| | while (lst) {
| | if(query_data->cb)
| | @@ -234,9 +234,9 @@ res_main_thread_cb(gpointer data)
| | }
| |
| | query_data->results = NULL;
| | - }
| |
| | - gaim_debug_info("dnssrv", "found %d SRV entries\n", size);
| | + gaim_debug_info("dnssrv", "found %d SRV entries\n", size);
| | + }
| |
| | if(query_data->cb)
| | query_data->cb(srvres, size, query_data->extradata);
| | @@ -367,29 +367,22 @@ gaim_srv_resolve(const char *protocol, c
| | query_data->query = query;
| | query_data->extradata = extradata;
| |
| | - if (!MyDnsQuery_UTF8 || !MyDnsRecordListFree) {
| | - query_data->error_message = g_strdup_printf("System missing DNS API (Requires W2K+)\n");
| | -
| | - /* Asynchronously call the callback since stuff may not expect
| | - * the callback to be called before this returns */
| | - query_data->handle = g_idle_add(res_main_thread_cb, query_data);
| | -
| | - return query_data;
| | + if (!MyDnsQuery_UTF8 || !MyDnsRecordListFree)
| | + query_data->error_message = g_strdup("System missing DNS API (Requires W2K+)\n");
| | + else {
| | + query_data->resolver = g_thread_create(res_thread, query_data, FALSE, &err);
| | + if (query_data->resolver == NULL) {
| | + query_data->error_message = g_strdup_printf("SRV thread create failure: %s\n", (err && err->message) ? err->message : "");
| | + g_error_free(err);
| | + }
| | }
| |
| | - query_data->resolver = g_thread_create(res_thread, query_data, FALSE, &err);
| | - if (query_data->resolver == NULL)
| | - {
| | - query_data->error_message = g_strdup_printf("SRV thread create failure: %s\n", err ? err->message : "");
| | - g_error_free(err);
| | -
| | - /* Asynchronously call the callback since stuff may not expect
| | - * the callback to be called before this returns */
| | + /* The query isn't going to happen, so finish the SRV lookup now.
| | + * Asynchronously call the callback since stuff may not expect
| | + * the callback to be called before this returns */
| | + if (query_data->error_message != NULL)
| | query_data->handle = g_idle_add(res_main_thread_cb, query_data);
| |
| | - return query_data;
| | - }
| | -
| | return query_data;
| | #endif
| | }
| | ============================================================
| | --- po/POTFILES.in fc291765cf57b807a21a0088fcfb4c0af060f737
| | +++ po/POTFILES.in 5e3c279a4a172c38f30bd0c87a49a0b2adfeadc4
| | @@ -1,33 +1,33 @@ pidgin.desktop.in
| | pidgin.desktop.in
| | -console/gntaccount.c
| | -console/gntblist.c
| | -console/gntconn.c
| | -console/gntconv.c
| | -console/gntdebug.c
| | -console/gntgaim.c
| | -console/gntnotify.c
| | -console/gntplugin.c
| | -console/gntprefs.c
| | -console/gntrequest.c
| | -console/gntstatus.c
| | -console/gntui.c
| | -console/libgnt/gntbox.c
| | -console/libgnt/gntbutton.c
| | -console/libgnt/gntcheckbox.c
| | -console/libgnt/gntcolors.c
| | -console/libgnt/gntcombobox.c
| | -console/libgnt/gntentry.c
| | -console/libgnt/gntkeys.c
| | -console/libgnt/gntlabel.c
| | -console/libgnt/gntline.c
| | -console/libgnt/gntstyle.c
| | -console/libgnt/gnttextview.c
| | -console/libgnt/gnttree.c
| | -console/libgnt/gntutils.c
| | -console/libgnt/gntwidget.c
| | -console/plugins/gntgf.c
| | -console/plugins/gnthistory.c
| | -console/plugins/lastlog.c
| | +finch/gntaccount.c
| | +finch/gntblist.c
| | +finch/gntconn.c
| | +finch/gntconv.c
| | +finch/gntdebug.c
| | +finch/gntgaim.c
| | +finch/gntnotify.c
| | +finch/gntplugin.c
| | +finch/gntprefs.c
| | +finch/gntrequest.c
| | +finch/gntstatus.c
| | +finch/gntui.c
| | +finch/libgnt/gntbox.c
| | +finch/libgnt/gntbutton.c
| | +finch/libgnt/gntcheckbox.c
| | +finch/libgnt/gntcolors.c
| | +finch/libgnt/gntcombobox.c
| | +finch/libgnt/gntentry.c
| | +finch/libgnt/gntkeys.c
| | +finch/libgnt/gntlabel.c
| | +finch/libgnt/gntline.c
| | +finch/libgnt/gntstyle.c
| | +finch/libgnt/gnttextview.c
| | +finch/libgnt/gnttree.c
| | +finch/libgnt/gntutils.c
| | +finch/libgnt/gntwidget.c
| | +finch/plugins/gntgf.c
| | +finch/plugins/gnthistory.c
| | +finch/plugins/lastlog.c
| | pidgin/eggtrayicon.c
| | pidgin/gaimcombobox.c
| | pidgin/gaimstock.c
To get the patch for this revision, please do this:
mtn log --last 1 --diffs --from fab2ec4334c8c32a4a33cf74896fdbf48dc76365
More information about the Commits
mailing list