Mercurial > pidgin
changeset 15632:deea490f2d91
merge of '46383975a415a7c7a37796205fd5ee523d5bc5e6'
and '8411ecb9a8c1bd0d0a87639e157b39d7e20934bb'
| author | Evan Schoenberg <evan.s@dreskin.net> |
|---|---|
| date | Wed, 14 Feb 2007 04:24:48 +0000 |
| parents | 593534b724b0 (current diff) a830f9756f23 (diff) |
| children | b4ac51aebf65 |
| files | |
| diffstat | 12 files changed, 62 insertions(+), 62 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/gtkblist.c Wed Feb 14 00:12:27 2007 +0000 +++ b/pidgin/gtkblist.c Wed Feb 14 04:24:48 2007 +0000 @@ -2232,13 +2232,13 @@ * | | * +---- TOOLTIP_BORDER +---- TOOLTIP_BORDER * - * + * */ #define STATUS_SIZE 22 #define TOOLTIP_BORDER 12 #define SMALL_SPACE 6 #define LARGE_SPACE 12 -#define PRPL_SIZE 16 +#define PRPL_SIZE 16 struct tooltip_data { PangoLayout *layout; PangoLayout *name_layout; @@ -2318,7 +2318,7 @@ GList *l; int prpl_col = 0; GtkTextDirection dir = gtk_widget_get_direction(widget); - + if(gtkblist->tooltipdata == NULL) return; @@ -2398,7 +2398,7 @@ if (dir == GTK_TEXT_DIR_RTL) { gtk_paint_layout(style, gtkblist->tipwindow->window, GTK_STATE_NORMAL, FALSE, NULL, gtkblist->tipwindow, "tooltip", - max_width -(TOOLTIP_BORDER + STATUS_SIZE +SMALL_SPACE) - PANGO_PIXELS(300000), + max_width -(TOOLTIP_BORDER + STATUS_SIZE +SMALL_SPACE) - PANGO_PIXELS(300000), current_height, td->name_layout); } else { gtk_paint_layout (style, gtkblist->tipwindow->window, GTK_STATE_NORMAL, FALSE, @@ -3031,20 +3031,20 @@ } else { return NULL; } - + if (!gaim_privacy_check(buddy->account, gaim_buddy_get_name(buddy))) { path = g_build_filename(DATADIR, "pixmaps", "pidgin", "emblems", "16", "blocked.png", NULL); ret = gdk_pixbuf_new_from_file(path, NULL); g_free(path); return ret; } - + p = gaim_buddy_get_presence(buddy); if (gaim_presence_is_status_primitive_active(p, GAIM_STATUS_MOBILE)) { path = g_build_filename(DATADIR, "pixmaps", "pidgin", "emblems", "16", "mobile.png", NULL); ret = gdk_pixbuf_new_from_file(path, NULL); g_free(path); - return ret; + return ret; } prpl = gaim_find_prpl(gaim_account_get_protocol_id(buddy->account)); @@ -3062,7 +3062,7 @@ path = g_build_filename(DATADIR, "pixmaps", "pidgin", "emblems", "16", filename, NULL); ret = gdk_pixbuf_new_from_file(path, NULL); - + g_free(filename); g_free(path); @@ -3116,7 +3116,7 @@ protoname = prpl_info->list_icon(account, buddy); } } - + if(buddy) { GaimConversation *conv = gaim_find_conversation_with_account(GAIM_CONV_TYPE_IM, gaim_buddy_get_name(buddy), @@ -3130,7 +3130,7 @@ } } p = gaim_buddy_get_presence(buddy); - + if (GAIM_BUDDY_IS_ONLINE(buddy) && gtkbuddynode && gtkbuddynode->recent_signonoff) ret = gtk_widget_render_icon (GTK_WIDGET(gtkblist->treeview), PIDGIN_STOCK_STATUS_LOGIN, icon_size, "GtkTreeView"); @@ -3201,7 +3201,7 @@ hidden_conv = TRUE; } } - + /* XXX Good luck cleaning up this crap */ contact = (GaimContact*)((GaimBlistNode*)b)->parent; @@ -3356,13 +3356,13 @@ g_free(idletime); g_free(statustext); g_free(esc); - + if (hidden_conv) { char *tmp = text; text = g_strdup_printf("<b>%s</b>", tmp); g_free(tmp); } - + return text; } @@ -3589,7 +3589,7 @@ tooltip_text = g_string_new(""); l = convs; while (l != NULL) { - if (GAIM_IS_GTK_CONVERSATION(l->data)) { + if (PIDGIN_IS_PIDGIN_CONVERSATION(l->data)) { PidginConversation *gtkconv = PIDGIN_CONVERSATION((GaimConversation *)l->data); g_string_append_printf(tooltip_text, @@ -3602,7 +3602,7 @@ if(tooltip_text->len > 0) { /* get rid of the last newline */ g_string_truncate(tooltip_text, tooltip_text->len -1); - img = gtk_image_new_from_stock(PIDGIN_STOCK_TOOLBAR_PENDING, + img = gtk_image_new_from_stock(PIDGIN_STOCK_TOOLBAR_PENDING, gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL)); gtkblist->menutrayicon = gtk_event_box_new();
--- a/pidgin/gtkblist.h Wed Feb 14 00:12:27 2007 +0000 +++ b/pidgin/gtkblist.h Wed Feb 14 04:24:48 2007 +0000 @@ -63,10 +63,10 @@ */ struct _PidginBuddyList { GtkWidget *window; - GtkWidget *notebook; /**< The notebook that switches between the real buddy list and the helpful + GtkWidget *notebook; /**< The notebook that switches between the real buddy list and the helpful instructions page */ GtkWidget *main_vbox; /**< This vbox contains the menu and notebook */ - GtkWidget *vbox; /**< This is the vbox that everything important gets packed into. + GtkWidget *vbox; /**< This is the vbox that everything important gets packed into. Your plugin might want to pack something in it itself. Go, plugins! */ GtkWidget *treeview; /**< It's a treeview... d'uh. */ @@ -100,7 +100,7 @@ GdkCursor *hand_cursor; /**< Hand cursor */ GdkCursor *arrow_cursor; /**< Arrow cursor */ - + GtkWidget *scrollbook; /**< Scrollbook for alerts */ GtkWidget *headline_hbox; /**< Hbox for headline notification */ GtkWidget *headline_label; /**< Label for headline notifications */ @@ -110,14 +110,14 @@ gpointer headline_data; /**< User data for headline notifications */ GDestroyNotify headline_destroy; /**< Callback to use for destroying the headline-data */ gboolean changing_style; /**< True when changing GTK+ theme style */ - + GtkWidget *error_buttons; /**< Box containing the connection error buttons */ GtkWidget *statusbox; /**< The status selector dropdown */ GdkPixbuf *empty_avatar; /**< A 32x32 transparent pixbuf */ }; #define PIDGIN_BLIST(list) ((PidginBuddyList *)(list)->ui_data) -#define GAIM_IS_GTK_BLIST(list) \ +#define PIDGIN_IS_PIDGIN_BLIST(list) \ ((list)->ui_ops == pidgin_blist_get_ui_ops()) /************************************************************************** @@ -183,7 +183,7 @@ * Returns the blist emblem * * @param node The node to return an emblem for - * + * * @return A newly created GdkPixbuf, or NULL */ GdkPixbuf * @@ -214,9 +214,9 @@ void pidgin_blist_toggle_visibility(void); /** - * Increases the reference count of visibility managers. Callers should - * call the complementary remove function when no longer managing - * visibility. + * Increases the reference count of visibility managers. Callers should + * call the complementary remove function when no longer managing + * visibility. * * A visibility manager is something that provides some method for * showing the buddy list after it is hidden (e.g. docklet plugin). @@ -349,7 +349,7 @@ * * This is currently used for mail notification, but could theoretically be used for anything. * Only the most recent headline will be shown. - * + * * @param text Pango Markup for the label text * @param pixbuf The GdkPixbuf for the icon * @param callback The callback to call when headline is clicked
--- a/pidgin/gtkconv.c Wed Feb 14 00:12:27 2007 +0000 +++ b/pidgin/gtkconv.c Wed Feb 14 04:24:48 2007 +0000 @@ -218,7 +218,7 @@ if (!GTK_WIDGET_VISIBLE(w)) return FALSE; - if (!GAIM_IS_GTK_CONVERSATION(conv)) + if (!PIDGIN_IS_PIDGIN_CONVERSATION(conv)) return FALSE; if (gtkconv->auto_resize) { @@ -2934,10 +2934,10 @@ gtk_item_factory_get_widget(win->menu.item_factory, N_("/Conversation/Block...")); - win->menu.unblock = + win->menu.unblock = gtk_item_factory_get_widget(win->menu.item_factory, N_("/Conversation/Unblock...")); - + win->menu.add = gtk_item_factory_get_widget(win->menu.item_factory, N_("/Conversation/Add...")); @@ -4184,7 +4184,7 @@ g_object_set_data(G_OBJECT(gtkconv->entry_buffer), "user_data", gtkconv); g_signal_connect_swapped(G_OBJECT(gtkconv->entry_buffer), "changed", G_CALLBACK(resize_imhtml_cb), gtkconv); - + g_signal_connect(G_OBJECT(gtkconv->entry), "key_press_event", G_CALLBACK(entry_key_press_cb), gtkconv); g_signal_connect_after(G_OBJECT(gtkconv->entry), "message_send", @@ -4795,7 +4795,7 @@ gboolean plugin_return; char *bracket; int tag_count = 0; - + g_return_if_fail(conv != NULL); gtkconv = PIDGIN_CONVERSATION(conv); g_return_if_fail(gtkconv != NULL); @@ -6000,7 +6000,7 @@ GaimBuddyIcon *icon; g_return_if_fail(conv != NULL); - g_return_if_fail(GAIM_IS_GTK_CONVERSATION(conv)); + g_return_if_fail(PIDGIN_IS_PIDGIN_CONVERSATION(conv)); g_return_if_fail(gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_IM); gtkconv = PIDGIN_CONVERSATION(conv); @@ -6151,7 +6151,7 @@ { PidginWindow *win; - if (!GAIM_IS_GTK_CONVERSATION(conv)) + if (!PIDGIN_IS_PIDGIN_CONVERSATION(conv)) return; win = PIDGIN_CONVERSATION(conv)->win; @@ -6240,7 +6240,7 @@ for (l = gaim_get_conversations(); l != NULL; l = l->next) { conv = (GaimConversation *)l->data; - if (!GAIM_IS_GTK_CONVERSATION(conv)) + if (!PIDGIN_IS_PIDGIN_CONVERSATION(conv)) continue; gtkconv = PIDGIN_CONVERSATION(conv); @@ -6266,7 +6266,7 @@ conv = (GaimConversation *)cl->data; - if (!GAIM_IS_GTK_CONVERSATION(conv)) + if (!PIDGIN_IS_PIDGIN_CONVERSATION(conv)) continue; gtkconv = PIDGIN_CONVERSATION(conv); @@ -6311,7 +6311,7 @@ { conv = (GaimConversation *)l->data; - if (!GAIM_IS_GTK_CONVERSATION(conv)) + if (!PIDGIN_IS_PIDGIN_CONVERSATION(conv)) continue; gtkconv = PIDGIN_CONVERSATION(conv); @@ -6339,7 +6339,7 @@ { conv = (GaimConversation *)l->data; - if (!GAIM_IS_GTK_CONVERSATION(conv)) + if (!PIDGIN_IS_PIDGIN_CONVERSATION(conv)) continue; gtkconv = PIDGIN_CONVERSATION(conv);
--- a/pidgin/gtkconv.h Wed Feb 14 00:12:27 2007 +0000 +++ b/pidgin/gtkconv.h Wed Feb 14 04:24:48 2007 +0000 @@ -55,7 +55,7 @@ #define PIDGIN_CONVERSATION(conv) \ ((PidginConversation *)(conv)->ui_data) -#define GAIM_IS_GTK_CONVERSATION(conv) \ +#define PIDGIN_IS_PIDGIN_CONVERSATION(conv) \ (gaim_conversation_get_ui_ops(conv) == \ pidgin_conversations_get_conv_ui_ops()) @@ -134,7 +134,7 @@ gboolean entry_growing; /* True if the size of the entry was set * automatically by typing too much to fit * in one line */ - + GtkWidget *close; /* "x" on the tab */ GtkWidget *icon; GtkWidget *tab_label;
--- a/pidgin/gtkdocklet.c Wed Feb 14 00:12:27 2007 +0000 +++ b/pidgin/gtkdocklet.c Wed Feb 14 04:24:48 2007 +0000 @@ -143,7 +143,7 @@ if (ui_ops->set_tooltip) { GString *tooltip_text = g_string_new(""); for (l = convs, count = 0 ; l != NULL ; l = l->next, count++) { - if (GAIM_IS_GTK_CONVERSATION(l->data)) { + if (PIDGIN_IS_PIDGIN_CONVERSATION(l->data)) { PidginConversation *gtkconv = PIDGIN_CONVERSATION((GaimConversation *)l->data); if (count == DOCKLET_TOOLTIP_LINE_LIMIT - 1) g_string_append(tooltip_text, _("Right-click for more unread messages...\n"));
--- a/pidgin/gtkft.c Wed Feb 14 00:12:27 2007 +0000 +++ b/pidgin/gtkft.c Wed Feb 14 04:24:48 2007 +0000 @@ -905,11 +905,11 @@ PidginXferDialog *tmp; if (dialog == NULL) { - tmp = gaim_get_gtkxfer_dialog(); + tmp = pidgin_get_xfer_dialog(); if (tmp == NULL) { tmp = pidginxfer_dialog_new(); - gaim_set_gtkxfer_dialog(tmp); + pidgin_set_xfer_dialog(tmp); } gtk_widget_show(tmp->window); @@ -1244,13 +1244,13 @@ } void -gaim_set_gtkxfer_dialog(PidginXferDialog *dialog) +pidgin_set_xfer_dialog(PidginXferDialog *dialog) { xfer_dialog = dialog; } PidginXferDialog * -gaim_get_gtkxfer_dialog(void) +pidgin_get_xfer_dialog(void) { return xfer_dialog; }
--- a/pidgin/gtkft.h Wed Feb 14 00:12:27 2007 +0000 +++ b/pidgin/gtkft.h Wed Feb 14 04:24:48 2007 +0000 @@ -122,18 +122,18 @@ void pidgin_xfers_uninit(void); /** - * Sets gaim's main file transfer dialog. + * Sets pidgin's main file transfer dialog. * * @param dialog The main dialog. */ -void gaim_set_gtkxfer_dialog(PidginXferDialog *dialog); +void pidgin_set_xfer_dialog(PidginXferDialog *dialog); /** - * Returns gaim's main file transfer dialog. + * Returns pirgin's main file transfer dialog. * * @return The main dialog. */ -PidginXferDialog *gaim_get_gtkxfer_dialog(void); +PidginXferDialog *pidgin_get_xfer_dialog(void); /** * Returns the UI operations structure for the GTK+ file transfer UI.
--- a/pidgin/gtkplugin.c Wed Feb 14 00:12:27 2007 +0000 +++ b/pidgin/gtkplugin.c Wed Feb 14 04:24:48 2007 +0000 @@ -51,7 +51,7 @@ g_return_val_if_fail(plugin != NULL, NULL); - if (GAIM_IS_GTK_PLUGIN(plugin) && plugin->info->ui_info + if (PIDGIN_IS_PIDGIN_PLUGIN(plugin) && plugin->info->ui_info && PIDGIN_PLUGIN_UI_INFO(plugin)->get_config_frame) { PidginPluginUiInfo *ui_info; @@ -175,7 +175,7 @@ { gtk_widget_set_sensitive(pref_button, loaded - && ((GAIM_IS_GTK_PLUGIN(plug) && plug->info->ui_info + && ((PIDGIN_IS_PIDGIN_PLUGIN(plug) && plug->info->ui_info && PIDGIN_PLUGIN_UI_INFO(plug)->get_config_frame) || (plug->info->prefs_info && plug->info->prefs_info->get_plugin_pref_frame))); @@ -307,7 +307,7 @@ gtk_widget_set_sensitive(pref_button, gaim_plugin_is_loaded(plug) - && ((GAIM_IS_GTK_PLUGIN(plug) && plug->info->ui_info + && ((PIDGIN_IS_PIDGIN_PLUGIN(plug) && plug->info->ui_info && PIDGIN_PLUGIN_UI_INFO(plug)->get_config_frame) || (plug->info->prefs_info && plug->info->prefs_info->get_plugin_pref_frame))); @@ -416,7 +416,7 @@ gtk_widget_set_sensitive(pref_button, gaim_plugin_is_loaded(plug) - && ((GAIM_IS_GTK_PLUGIN(plug) && plug->info->ui_info + && ((PIDGIN_IS_PIDGIN_PLUGIN(plug) && plug->info->ui_info && PIDGIN_PLUGIN_UI_INFO(plug)->get_config_frame) || (plug->info->prefs_info && plug->info->prefs_info->get_plugin_pref_frame)));
--- a/pidgin/gtkplugin.h Wed Feb 14 00:12:27 2007 +0000 +++ b/pidgin/gtkplugin.h Wed Feb 14 04:24:48 2007 +0000 @@ -7,7 +7,7 @@ * Pidgin is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this * source distribution. - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -42,7 +42,7 @@ #define PIDGIN_PLUGIN_TYPE PIDGIN_UI -#define GAIM_IS_GTK_PLUGIN(plugin) \ +#define PIDGIN_IS_PIDGIN_PLUGIN(plugin) \ ((plugin)->info != NULL && (plugin)->info->ui_info != NULL && \ !strcmp((plugin)->info->ui_requirement, PIDGIN_PLUGIN_TYPE))
--- a/pidgin/gtkthemes.c Wed Feb 14 00:12:27 2007 +0000 +++ b/pidgin/gtkthemes.c Wed Feb 14 04:24:48 2007 +0000 @@ -248,7 +248,7 @@ for (cnv = gaim_get_conversations(); cnv != NULL; cnv = cnv->next) { GaimConversation *conv = cnv->data; - if (GAIM_IS_GTK_CONVERSATION(conv)) { + if (PIDGIN_IS_PIDGIN_CONVERSATION(conv)) { pidginthemes_smiley_themeize(PIDGIN_CONVERSATION(conv)->imhtml); pidginthemes_smiley_themeize(PIDGIN_CONVERSATION(conv)->entry); }
--- a/pidgin/pidgin.h Wed Feb 14 00:12:27 2007 +0000 +++ b/pidgin/pidgin.h Wed Feb 14 04:24:48 2007 +0000 @@ -23,8 +23,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ /* #warning ***pidgin*** */ -#ifndef _PIDGINGAIM_H_ -#define _PIDGINGAIM_H_ +#ifndef _PIDGIN_H_ +#define _PIDGIN_H_ #ifndef _WIN32 # include <gdk/gdkx.h> @@ -44,7 +44,7 @@ #ifndef _WIN32 # define GAIM_ALERT_TITLE "" #else -# define GAIM_ALERT_TITLE PIDGIN_NAME +# define GAIM_ALERT_TITLE PIDGIN_NAME #endif /* @@ -88,5 +88,5 @@ */ #define GAIM_INVISIBLE_CHAR (gunichar)0x2022 -#endif /* _PIDGINGAIM_H_ */ +#endif /* _PIDGIN_H_ */
--- a/pidgin/plugins/gestures/gestures.c Wed Feb 14 00:12:27 2007 +0000 +++ b/pidgin/plugins/gestures/gestures.c Wed Feb 14 04:24:48 2007 +0000 @@ -43,7 +43,7 @@ conv = (GaimConversation *)data; /* Double-check */ - if (!GAIM_IS_GTK_CONVERSATION(conv)) + if (!PIDGIN_IS_PIDGIN_CONVERSATIONON(conv)) return; gtkconv = PIDGIN_CONVERSATION(conv); @@ -144,7 +144,7 @@ static void new_conv_cb(GaimConversation *conv) { - if (GAIM_IS_GTK_CONVERSATION(conv)) + if (PIDGIN_IS_PIDGIN_CONVERSATIONON(conv)) attach_signals(conv); } @@ -181,7 +181,7 @@ for (l = gaim_get_conversations(); l != NULL; l = l->next) { conv = (GaimConversation *)l->data; - if (!GAIM_IS_GTK_CONVERSATION(conv)) + if (!PIDGIN_IS_PIDGIN_CONVERSATIONON(conv)) continue; attach_signals(conv); @@ -204,7 +204,7 @@ for (l = gaim_get_conversations(); l != NULL; l = l->next) { conv = (GaimConversation *)l->data; - if (!GAIM_IS_GTK_CONVERSATION(conv)) + if (!PIDGIN_IS_PIDGIN_CONVERSATION(conv)) continue; gtkconv = PIDGIN_CONVERSATION(conv);