pidgin: dfcd74aa: All this G_OBJECT() casting is quite unn...
qulogic at pidgin.im
qulogic at pidgin.im
Sat Sep 17 01:45:47 EDT 2011
----------------------------------------------------------------------
Revision: dfcd74aab4740798310b4338d6bff9682481db73
Parent: e0487da05cd85c43001edc85d79ca1e4e3f5ee6e
Author: qulogic at pidgin.im
Date: 09/17/11 01:43:58
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/dfcd74aab4740798310b4338d6bff9682481db73
Changelog:
All this G_OBJECT() casting is quite unnecessary.
Changes against parent e0487da05cd85c43001edc85d79ca1e4e3f5ee6e
patched pidgin/gtkblist-theme.c
-------------- next part --------------
============================================================
--- pidgin/gtkblist-theme.c 8f6ed828c6a55a28fd3340b29ecaba8b12dd5974
+++ pidgin/gtkblist-theme.c d03ecde39a15a5c7361f2b016c95255eeeb98a17
@@ -500,7 +500,7 @@ pidgin_blist_theme_get_background_color(
g_return_val_if_fail(PIDGIN_IS_BLIST_THEME(theme), NULL);
- priv = PIDGIN_BLIST_THEME_GET_PRIVATE(G_OBJECT(theme));
+ priv = PIDGIN_BLIST_THEME_GET_PRIVATE(theme);
return priv->bgcolor;
}
@@ -512,7 +512,7 @@ pidgin_blist_theme_get_opacity(PidginBli
g_return_val_if_fail(PIDGIN_IS_BLIST_THEME(theme), 1.0);
- priv = PIDGIN_BLIST_THEME_GET_PRIVATE(G_OBJECT(theme));
+ priv = PIDGIN_BLIST_THEME_GET_PRIVATE(theme);
return priv->opacity;
}
@@ -524,7 +524,7 @@ pidgin_blist_theme_get_layout(PidginBlis
g_return_val_if_fail(PIDGIN_IS_BLIST_THEME(theme), NULL);
- priv = PIDGIN_BLIST_THEME_GET_PRIVATE(G_OBJECT(theme));
+ priv = PIDGIN_BLIST_THEME_GET_PRIVATE(theme);
return priv->layout;
}
@@ -536,7 +536,7 @@ pidgin_blist_theme_get_expanded_backgrou
g_return_val_if_fail(PIDGIN_IS_BLIST_THEME(theme), NULL);
- priv = PIDGIN_BLIST_THEME_GET_PRIVATE(G_OBJECT(theme));
+ priv = PIDGIN_BLIST_THEME_GET_PRIVATE(theme);
return priv->expanded_color;
}
@@ -548,7 +548,7 @@ pidgin_blist_theme_get_expanded_text_inf
g_return_val_if_fail(PIDGIN_IS_BLIST_THEME(theme), NULL);
- priv = PIDGIN_BLIST_THEME_GET_PRIVATE(G_OBJECT(theme));
+ priv = PIDGIN_BLIST_THEME_GET_PRIVATE(theme);
return priv->expanded;
}
@@ -560,7 +560,7 @@ pidgin_blist_theme_get_collapsed_backgro
g_return_val_if_fail(PIDGIN_IS_BLIST_THEME(theme), NULL);
- priv = PIDGIN_BLIST_THEME_GET_PRIVATE(G_OBJECT(theme));
+ priv = PIDGIN_BLIST_THEME_GET_PRIVATE(theme);
return priv->collapsed_color;
}
@@ -572,7 +572,7 @@ pidgin_blist_theme_get_collapsed_text_in
g_return_val_if_fail(PIDGIN_IS_BLIST_THEME(theme), NULL);
- priv = PIDGIN_BLIST_THEME_GET_PRIVATE(G_OBJECT(theme));
+ priv = PIDGIN_BLIST_THEME_GET_PRIVATE(theme);
return priv->collapsed;
}
@@ -584,7 +584,7 @@ pidgin_blist_theme_get_contact_color(Pid
g_return_val_if_fail(PIDGIN_IS_BLIST_THEME(theme), NULL);
- priv = PIDGIN_BLIST_THEME_GET_PRIVATE(G_OBJECT(theme));
+ priv = PIDGIN_BLIST_THEME_GET_PRIVATE(theme);
return priv->contact_color;
}
@@ -596,7 +596,7 @@ pidgin_blist_theme_get_contact_text_info
g_return_val_if_fail(PIDGIN_IS_BLIST_THEME(theme), NULL);
- priv = PIDGIN_BLIST_THEME_GET_PRIVATE(G_OBJECT(theme));
+ priv = PIDGIN_BLIST_THEME_GET_PRIVATE(theme);
return priv->contact;
}
@@ -608,7 +608,7 @@ pidgin_blist_theme_get_online_text_info(
g_return_val_if_fail(PIDGIN_IS_BLIST_THEME(theme), NULL);
- priv = PIDGIN_BLIST_THEME_GET_PRIVATE(G_OBJECT(theme));
+ priv = PIDGIN_BLIST_THEME_GET_PRIVATE(theme);
return priv->online;
}
@@ -620,7 +620,7 @@ pidgin_blist_theme_get_away_text_info(Pi
g_return_val_if_fail(PIDGIN_IS_BLIST_THEME(theme), NULL);
- priv = PIDGIN_BLIST_THEME_GET_PRIVATE(G_OBJECT(theme));
+ priv = PIDGIN_BLIST_THEME_GET_PRIVATE(theme);
return priv->away;
}
@@ -632,7 +632,7 @@ pidgin_blist_theme_get_offline_text_info
g_return_val_if_fail(PIDGIN_IS_BLIST_THEME(theme), NULL);
- priv = PIDGIN_BLIST_THEME_GET_PRIVATE(G_OBJECT(theme));
+ priv = PIDGIN_BLIST_THEME_GET_PRIVATE(theme);
return priv->offline;
}
@@ -644,7 +644,7 @@ pidgin_blist_theme_get_idle_text_info(Pi
g_return_val_if_fail(PIDGIN_IS_BLIST_THEME(theme), NULL);
- priv = PIDGIN_BLIST_THEME_GET_PRIVATE(G_OBJECT(theme));
+ priv = PIDGIN_BLIST_THEME_GET_PRIVATE(theme);
return priv->idle;
}
@@ -656,7 +656,7 @@ pidgin_blist_theme_get_unread_message_te
g_return_val_if_fail(PIDGIN_IS_BLIST_THEME(theme), NULL);
- priv = PIDGIN_BLIST_THEME_GET_PRIVATE(G_OBJECT(theme));
+ priv = PIDGIN_BLIST_THEME_GET_PRIVATE(theme);
return priv->message;
}
@@ -668,7 +668,7 @@ pidgin_blist_theme_get_unread_message_ni
g_return_val_if_fail(PIDGIN_IS_BLIST_THEME(theme), NULL);
- priv = PIDGIN_BLIST_THEME_GET_PRIVATE(G_OBJECT(theme));
+ priv = PIDGIN_BLIST_THEME_GET_PRIVATE(theme);
return priv->message_nick_said;
}
@@ -680,7 +680,7 @@ pidgin_blist_theme_get_status_text_info(
g_return_val_if_fail(PIDGIN_IS_BLIST_THEME(theme), NULL);
- priv = PIDGIN_BLIST_THEME_GET_PRIVATE(G_OBJECT(theme));
+ priv = PIDGIN_BLIST_THEME_GET_PRIVATE(theme);
return priv->status;
}
@@ -693,7 +693,7 @@ pidgin_blist_theme_set_background_color(
g_return_if_fail(PIDGIN_IS_BLIST_THEME(theme));
- priv = PIDGIN_BLIST_THEME_GET_PRIVATE(G_OBJECT(theme));
+ priv = PIDGIN_BLIST_THEME_GET_PRIVATE(theme);
if (priv->bgcolor)
gdk_color_free(priv->bgcolor);
@@ -707,7 +707,7 @@ pidgin_blist_theme_set_opacity(PidginBli
g_return_if_fail(PIDGIN_IS_BLIST_THEME(theme) || opacity < 0.0 || opacity > 1.0);
- priv = PIDGIN_BLIST_THEME_GET_PRIVATE(G_OBJECT(theme));
+ priv = PIDGIN_BLIST_THEME_GET_PRIVATE(theme);
priv->opacity = opacity;
}
@@ -719,7 +719,7 @@ pidgin_blist_theme_set_layout(PidginBlis
g_return_if_fail(PIDGIN_IS_BLIST_THEME(theme));
- priv = PIDGIN_BLIST_THEME_GET_PRIVATE(G_OBJECT(theme));
+ priv = PIDGIN_BLIST_THEME_GET_PRIVATE(theme);
g_free(priv->layout);
priv->layout = g_memdup(layout, sizeof(PidginBlistLayout));
@@ -732,7 +732,7 @@ pidgin_blist_theme_set_expanded_backgrou
g_return_if_fail(PIDGIN_IS_BLIST_THEME(theme));
- priv = PIDGIN_BLIST_THEME_GET_PRIVATE(G_OBJECT(theme));
+ priv = PIDGIN_BLIST_THEME_GET_PRIVATE(theme);
if (priv->expanded_color)
gdk_color_free(priv->expanded_color);
@@ -746,7 +746,7 @@ pidgin_blist_theme_set_expanded_text_inf
g_return_if_fail(PIDGIN_IS_BLIST_THEME(theme));
- priv = PIDGIN_BLIST_THEME_GET_PRIVATE(G_OBJECT(theme));
+ priv = PIDGIN_BLIST_THEME_GET_PRIVATE(theme);
pidgin_theme_font_free(priv->expanded);
priv->expanded = copy_font_and_color(pair);
@@ -759,7 +759,7 @@ pidgin_blist_theme_set_collapsed_backgro
g_return_if_fail(PIDGIN_IS_BLIST_THEME(theme));
- priv = PIDGIN_BLIST_THEME_GET_PRIVATE(G_OBJECT(theme));
+ priv = PIDGIN_BLIST_THEME_GET_PRIVATE(theme);
if (priv->collapsed_color)
gdk_color_free(priv->collapsed_color);
@@ -773,7 +773,7 @@ pidgin_blist_theme_set_collapsed_text_in
g_return_if_fail(PIDGIN_IS_BLIST_THEME(theme));
- priv = PIDGIN_BLIST_THEME_GET_PRIVATE(G_OBJECT(theme));
+ priv = PIDGIN_BLIST_THEME_GET_PRIVATE(theme);
pidgin_theme_font_free(priv->collapsed);
priv->collapsed = copy_font_and_color(pair);
@@ -786,7 +786,7 @@ pidgin_blist_theme_set_contact_color(Pid
g_return_if_fail(PIDGIN_IS_BLIST_THEME(theme));
- priv = PIDGIN_BLIST_THEME_GET_PRIVATE(G_OBJECT(theme));
+ priv = PIDGIN_BLIST_THEME_GET_PRIVATE(theme);
if (priv->contact_color)
gdk_color_free(priv->contact_color);
@@ -800,7 +800,7 @@ pidgin_blist_theme_set_contact_text_info
g_return_if_fail(PIDGIN_IS_BLIST_THEME(theme));
- priv = PIDGIN_BLIST_THEME_GET_PRIVATE(G_OBJECT(theme));
+ priv = PIDGIN_BLIST_THEME_GET_PRIVATE(theme);
pidgin_theme_font_free(priv->contact);
priv->contact = copy_font_and_color(pair);
@@ -813,7 +813,7 @@ pidgin_blist_theme_set_online_text_info(
g_return_if_fail(PIDGIN_IS_BLIST_THEME(theme));
- priv = PIDGIN_BLIST_THEME_GET_PRIVATE(G_OBJECT(theme));
+ priv = PIDGIN_BLIST_THEME_GET_PRIVATE(theme);
pidgin_theme_font_free(priv->online);
priv->online = copy_font_and_color(pair);
@@ -826,7 +826,7 @@ pidgin_blist_theme_set_away_text_info(Pi
g_return_if_fail(PIDGIN_IS_BLIST_THEME(theme));
- priv = PIDGIN_BLIST_THEME_GET_PRIVATE(G_OBJECT(theme));
+ priv = PIDGIN_BLIST_THEME_GET_PRIVATE(theme);
pidgin_theme_font_free(priv->away);
priv->away = copy_font_and_color(pair);
@@ -839,7 +839,7 @@ pidgin_blist_theme_set_offline_text_info
g_return_if_fail(PIDGIN_IS_BLIST_THEME(theme));
- priv = PIDGIN_BLIST_THEME_GET_PRIVATE(G_OBJECT(theme));
+ priv = PIDGIN_BLIST_THEME_GET_PRIVATE(theme);
pidgin_theme_font_free(priv->offline);
priv->offline = copy_font_and_color(pair);
@@ -852,7 +852,7 @@ pidgin_blist_theme_set_idle_text_info(Pi
g_return_if_fail(PIDGIN_IS_BLIST_THEME(theme));
- priv = PIDGIN_BLIST_THEME_GET_PRIVATE(G_OBJECT(theme));
+ priv = PIDGIN_BLIST_THEME_GET_PRIVATE(theme);
pidgin_theme_font_free(priv->idle);
priv->idle = copy_font_and_color(pair);
@@ -865,7 +865,7 @@ pidgin_blist_theme_set_unread_message_te
g_return_if_fail(PIDGIN_IS_BLIST_THEME(theme));
- priv = PIDGIN_BLIST_THEME_GET_PRIVATE(G_OBJECT(theme));
+ priv = PIDGIN_BLIST_THEME_GET_PRIVATE(theme);
pidgin_theme_font_free(priv->message);
priv->message = copy_font_and_color(pair);
@@ -878,7 +878,7 @@ pidgin_blist_theme_set_unread_message_ni
g_return_if_fail(PIDGIN_IS_BLIST_THEME(theme));
- priv = PIDGIN_BLIST_THEME_GET_PRIVATE(G_OBJECT(theme));
+ priv = PIDGIN_BLIST_THEME_GET_PRIVATE(theme);
pidgin_theme_font_free(priv->message_nick_said);
priv->message_nick_said = copy_font_and_color(pair);
@@ -891,7 +891,7 @@ pidgin_blist_theme_set_status_text_info(
g_return_if_fail(PIDGIN_IS_BLIST_THEME(theme));
- priv = PIDGIN_BLIST_THEME_GET_PRIVATE(G_OBJECT(theme));
+ priv = PIDGIN_BLIST_THEME_GET_PRIVATE(theme);
pidgin_theme_font_free(priv->status);
priv->status = copy_font_and_color(pair);
More information about the Commits
mailing list