/soc/2013/ankitkv/gobjectification: 9c245220151d: Merged default...
Ankit Vani
a at nevitus.org
Tue Feb 25 18:08:46 EST 2014
Changeset: 9c245220151d20f3bece2138a5227b5d81045112
Author: Ankit Vani <a at nevitus.org>
Date: 2014-02-26 04:37 +0530
Branch: soc.2013.gobjectification.plugins
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/9c245220151d
Description:
Merged default branch
diffstat:
pidgin/gtkconv.c | 279 ++++++++++++++----------
pidgin/gtkconv.h | 6 +-
pidgin/gtkconvwin.h | 194 +++++++++++++++--
pidgin/plugins/extplacement.c | 2 +-
pidgin/plugins/gestures/gestures.c | 8 +-
pidgin/plugins/gtk-signals-test.c | 2 +-
pidgin/plugins/iconaway.c | 4 +-
pidgin/plugins/markerline.c | 10 +-
pidgin/plugins/notify.c | 38 +-
pidgin/plugins/perl/common/gtkmodule.h | 2 +-
pidgin/plugins/unity.c | 4 +-
pidgin/plugins/win32/transparency/win2ktrans.c | 18 +-
pidgin/win32/gtkwin32dep.c | 2 +-
13 files changed, 375 insertions(+), 194 deletions(-)
diffs (truncated from 1702 to 300 lines):
diff --git a/pidgin/gtkconv.c b/pidgin/gtkconv.c
--- a/pidgin/gtkconv.c
+++ b/pidgin/gtkconv.c
@@ -176,7 +176,7 @@ typedef struct {
static GtkWidget *invite_dialog = NULL;
static GtkWidget *warn_close_dialog = NULL;
-static PidginWindow *hidden_convwin = NULL;
+static PidginConvWindow *hidden_convwin = NULL;
static GList *window_list = NULL;
/* Lists of status icons at all available sizes for use as window icons */
@@ -190,8 +190,8 @@ static GHashTable *e2ee_stock = NULL;
static PurpleTheme *default_conv_theme = NULL;
-static gboolean update_send_to_selection(PidginWindow *win);
-static void generate_send_to_items(PidginWindow *win);
+static gboolean update_send_to_selection(PidginConvWindow *win);
+static void generate_send_to_items(PidginConvWindow *win);
/* Prototypes. <-- because Paco-Paco hates this comment. */
static void load_conv_theme(PidginConversation *gtkconv);
@@ -210,14 +210,14 @@ static GArray* generate_nick_colors(guin
static gboolean color_is_visible(GdkColor foreground, GdkColor background, guint color_contrast, guint brightness_contrast);
static GtkTextTag *get_buddy_tag(PurpleChatConversation *chat, const char *who, PurpleMessageFlags flag, gboolean create);
static void pidgin_conv_update_fields(PurpleConversation *conv, PidginConvFields fields);
-static void focus_out_from_menubar(GtkWidget *wid, PidginWindow *win);
-static void pidgin_conv_tab_pack(PidginWindow *win, PidginConversation *gtkconv);
+static void focus_out_from_menubar(GtkWidget *wid, PidginConvWindow *win);
+static void pidgin_conv_tab_pack(PidginConvWindow *win, PidginConversation *gtkconv);
static gboolean infopane_press_cb(GtkWidget *widget, GdkEventButton *e, PidginConversation *conv);
static void hide_conv(PidginConversation *gtkconv, gboolean closetimer);
-static void pidgin_conv_set_position_size(PidginWindow *win, int x, int y,
+static void pidgin_conv_set_position_size(PidginConvWindow *win, int x, int y,
int width, int height);
-static gboolean pidgin_conv_xy_to_right_infopane(PidginWindow *win, int x, int y);
+static gboolean pidgin_conv_xy_to_right_infopane(PidginConvWindow *win, int x, int y);
static const GdkColor *get_nick_color(PidginConversation *gtkconv, const char *name)
{
@@ -926,7 +926,7 @@ invite_cb(GtkWidget *widget, PidginConve
InviteBuddyInfo *info = NULL;
if (invite_dialog == NULL) {
- PidginWindow *gtkwin;
+ PidginConvWindow *gtkwin;
GtkWidget *label;
GtkWidget *vbox, *hbox;
GtkWidget *table;
@@ -1104,7 +1104,7 @@ savelog_writefile_cb(void *user_data, co
static void
menu_save_as_cb(GtkAction *action, gpointer data)
{
- PidginWindow *win = data;
+ PidginConvWindow *win = data;
PurpleConversation *conv = pidgin_conv_window_get_active_conversation(win);
PurpleAccount *account = purple_conversation_get_account(conv);
PurpleBuddy *buddy = purple_blist_find_buddy(account, purple_conversation_get_name(conv));
@@ -1133,7 +1133,7 @@ menu_save_as_cb(GtkAction *action, gpoin
static void
menu_view_log_cb(GtkAction *action, gpointer data)
{
- PidginWindow *win = data;
+ PidginConvWindow *win = data;
PurpleConversation *conv;
PurpleLogType type;
PidginBuddyList *gtkblist;
@@ -1183,7 +1183,7 @@ menu_view_log_cb(GtkAction *action, gpoi
static void
menu_clear_cb(GtkAction *action, gpointer data)
{
- PidginWindow *win = data;
+ PidginConvWindow *win = data;
PurpleConversation *conv;
conv = pidgin_conv_window_get_active_conversation(win);
@@ -1193,7 +1193,7 @@ menu_clear_cb(GtkAction *action, gpointe
static void
menu_find_cb(GtkAction *action, gpointer data)
{
- PidginWindow *gtkwin = data;
+ PidginConvWindow *gtkwin = data;
PidginConversation *gtkconv = pidgin_conv_window_get_active_gtkconv(gtkwin);
gtk_widget_show_all(gtkconv->quickfind_container);
gtk_widget_grab_focus(gtkconv->quickfind_entry);
@@ -1203,7 +1203,7 @@ menu_find_cb(GtkAction *action, gpointer
static void
menu_initiate_media_call_cb(GtkAction *action, gpointer data)
{
- PidginWindow *win = (PidginWindow *)data;
+ PidginConvWindow *win = (PidginConvWindow *)data;
PurpleConversation *conv = pidgin_conv_window_get_active_conversation(win);
PurpleAccount *account = purple_conversation_get_account(conv);
@@ -1219,7 +1219,7 @@ menu_initiate_media_call_cb(GtkAction *a
static void
menu_send_file_cb(GtkAction *action, gpointer data)
{
- PidginWindow *win = data;
+ PidginConvWindow *win = data;
PurpleConversation *conv = pidgin_conv_window_get_active_conversation(win);
if (PURPLE_IS_IM_CONVERSATION(conv)) {
@@ -1231,7 +1231,7 @@ menu_send_file_cb(GtkAction *action, gpo
static void
menu_get_attention_cb(GObject *obj, gpointer data)
{
- PidginWindow *win = data;
+ PidginConvWindow *win = data;
PurpleConversation *conv = pidgin_conv_window_get_active_conversation(win);
if (PURPLE_IS_IM_CONVERSATION(conv)) {
@@ -1248,7 +1248,7 @@ menu_get_attention_cb(GObject *obj, gpoi
static void
menu_add_pounce_cb(GtkAction *action, gpointer data)
{
- PidginWindow *win = data;
+ PidginConvWindow *win = data;
PurpleConversation *conv;
conv = pidgin_conv_window_get_active_gtkconv(win)->active_conv;
@@ -1260,7 +1260,7 @@ menu_add_pounce_cb(GtkAction *action, gp
static void
menu_insert_link_cb(GtkAction *action, gpointer data)
{
- PidginWindow *win = data;
+ PidginConvWindow *win = data;
PidginConversation *gtkconv;
PidginWebView *entry;
@@ -1273,7 +1273,7 @@ menu_insert_link_cb(GtkAction *action, g
static void
menu_insert_image_cb(GtkAction *action, gpointer data)
{
- PidginWindow *win = data;
+ PidginConvWindow *win = data;
PidginConversation *gtkconv;
PidginWebView *entry;
@@ -1286,7 +1286,7 @@ menu_insert_image_cb(GtkAction *action,
static void
menu_alias_cb(GtkAction *action, gpointer data)
{
- PidginWindow *win = data;
+ PidginConvWindow *win = data;
PurpleConversation *conv;
PurpleAccount *account;
const char *name;
@@ -1313,7 +1313,7 @@ menu_alias_cb(GtkAction *action, gpointe
static void
menu_get_info_cb(GtkAction *action, gpointer data)
{
- PidginWindow *win = data;
+ PidginConvWindow *win = data;
PurpleConversation *conv;
conv = pidgin_conv_window_get_active_conversation(win);
@@ -1324,7 +1324,7 @@ menu_get_info_cb(GtkAction *action, gpoi
static void
menu_invite_cb(GtkAction *action, gpointer data)
{
- PidginWindow *win = data;
+ PidginConvWindow *win = data;
PurpleConversation *conv;
conv = pidgin_conv_window_get_active_conversation(win);
@@ -1335,7 +1335,7 @@ menu_invite_cb(GtkAction *action, gpoint
static void
menu_block_cb(GtkAction *action, gpointer data)
{
- PidginWindow *win = data;
+ PidginConvWindow *win = data;
PurpleConversation *conv;
conv = pidgin_conv_window_get_active_conversation(win);
@@ -1346,7 +1346,7 @@ menu_block_cb(GtkAction *action, gpointe
static void
menu_unblock_cb(GtkAction *action, gpointer data)
{
- PidginWindow *win = data;
+ PidginConvWindow *win = data;
PurpleConversation *conv;
conv = pidgin_conv_window_get_active_conversation(win);
@@ -1357,7 +1357,7 @@ menu_unblock_cb(GtkAction *action, gpoin
static void
menu_add_remove_cb(GtkAction *action, gpointer data)
{
- PidginWindow *win = data;
+ PidginConvWindow *win = data;
PurpleConversation *conv;
conv = pidgin_conv_window_get_active_conversation(win);
@@ -1402,7 +1402,7 @@ hide_conv(PidginConversation *gtkconv, g
static void
menu_close_conv_cb(GtkAction *action, gpointer data)
{
- PidginWindow *win = data;
+ PidginConvWindow *win = data;
close_conv_cb(NULL, PIDGIN_CONVERSATION(pidgin_conv_window_get_active_conversation(win)));
}
@@ -1410,7 +1410,7 @@ menu_close_conv_cb(GtkAction *action, gp
static void
menu_logging_cb(GtkAction *action, gpointer data)
{
- PidginWindow *win = data;
+ PidginConvWindow *win = data;
PurpleConversation *conv;
gboolean logging;
PurpleBlistNode *node;
@@ -1472,7 +1472,7 @@ menu_toolbar_cb(GtkAction *action, gpoin
static void
menu_sounds_cb(GtkAction *action, gpointer data)
{
- PidginWindow *win = data;
+ PidginConvWindow *win = data;
PurpleConversation *conv;
PidginConversation *gtkconv;
PurpleBlistNode *node;
@@ -1889,7 +1889,7 @@ move_to_next_unread_tab(PidginConversati
{
PidginConversation *next_gtkconv = NULL, *most_active = NULL;
PidginUnseenState unseen_state = PIDGIN_UNSEEN_NONE;
- PidginWindow *win;
+ PidginConvWindow *win;
int initial, i, total, diff;
win = gtkconv->win;
@@ -2010,7 +2010,7 @@ update_typing_deleting(PidginConversatio
static gboolean
conv_keypress_common(PidginConversation *gtkconv, GdkEventKey *event)
{
- PidginWindow *win;
+ PidginConvWindow *win;
int curconv;
win = gtkconv->win;
@@ -2347,7 +2347,7 @@ refocus_entry_cb(GtkWidget *widget, GdkE
}
static void
-regenerate_options_items(PidginWindow *win);
+regenerate_options_items(PidginConvWindow *win);
void
pidgin_conv_switch_active_conversation(PurpleConversation *conv)
@@ -2626,7 +2626,7 @@ static void
update_tab_icon(PurpleConversation *conv)
{
PidginConversation *gtkconv;
- PidginWindow *win;
+ PidginConvWindow *win;
GList *l;
GdkPixbuf *emblem = NULL;
const char *status = NULL;
@@ -3162,7 +3162,7 @@ pidgin_conversations_fill_menu(GtkWidget
return ret;
}
-PidginWindow *
+PidginConvWindow *
pidgin_conv_get_window(PidginConversation *gtkconv)
{
g_return_val_if_fail(gtkconv != NULL, NULL);
@@ -3264,7 +3264,7 @@ static void
sound_method_pref_changed_cb(const char *name, PurplePrefType type,
gconstpointer value, gpointer data)
{
- PidginWindow *win = data;
+ PidginConvWindow *win = data;
const char *method = value;
if (!strcmp(method, "none"))
@@ -3371,7 +3371,7 @@ populate_menu_with_options(GtkWidget *me
}
static void
-regenerate_media_items(PidginWindow *win)
+regenerate_media_items(PidginConvWindow *win)
{
#ifdef USE_VV
PurpleAccount *account;
@@ -3425,7 +3425,7 @@ regenerate_media_items(PidginWindow *win
}
static void
-regenerate_attention_items(PidginWindow *win)
+regenerate_attention_items(PidginConvWindow *win)
{
GtkWidget *attention;
GtkWidget *menu;
@@ -3480,7 +3480,7 @@ regenerate_attention_items(PidginWindow
}
static void
-regenerate_options_items(PidginWindow *win)
+regenerate_options_items(PidginConvWindow *win)
More information about the Commits
mailing list