[empathy: 5/11] factor out empathy_make_color_whiter()
- From: Guillaume Desmottes <gdesmott src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy: 5/11] factor out empathy_make_color_whiter()
- Date: Wed, 15 Dec 2010 16:02:15 +0000 (UTC)
commit 676e1f544d851935cb2dc7781f4a5ff39c366b2f
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date: Wed Dec 15 14:43:31 2010 +0100
factor out empathy_make_color_whiter()
libempathy-gtk/empathy-account-widget.c | 5 +----
libempathy-gtk/empathy-ui-utils.c | 10 ++++++++++
libempathy-gtk/empathy-ui-utils.h | 3 +++
3 files changed, 14 insertions(+), 4 deletions(-)
---
diff --git a/libempathy-gtk/empathy-account-widget.c b/libempathy-gtk/empathy-account-widget.c
index 7df208a..ea15720 100644
--- a/libempathy-gtk/empathy-account-widget.c
+++ b/libempathy-gtk/empathy-account-widget.c
@@ -235,7 +235,6 @@ account_widget_set_entry_highlighting (GtkEntry *entry,
{
GtkStyleContext *style;
GdkRGBA color;
- const GdkRGBA white = { 1.0, 1.0, 1.0, 1.0 };
style = gtk_widget_get_style_context (GTK_WIDGET (entry));
gtk_style_context_get_background_color (style, GTK_STATE_FLAG_SELECTED,
@@ -246,9 +245,7 @@ account_widget_set_entry_highlighting (GtkEntry *entry,
* gives a colour which is inline with the theme but
* slightly whiter.
*/
- color.red = (color.red + (white).red) / 2;
- color.green = (color.green + (white).green) / 2;
- color.blue = (color.blue + (white).blue) / 2;
+ empathy_make_color_whiter (&color);
gtk_widget_override_background_color (GTK_WIDGET (entry), 0, &color);
}
diff --git a/libempathy-gtk/empathy-ui-utils.c b/libempathy-gtk/empathy-ui-utils.c
index 043c03e..d7abb9a 100644
--- a/libempathy-gtk/empathy-ui-utils.c
+++ b/libempathy-gtk/empathy-ui-utils.c
@@ -1898,3 +1898,13 @@ empathy_receive_file_with_file_chooser (EmpathyFTHandler *handler)
gtk_widget_show (widget);
g_free (title);
}
+
+void
+empathy_make_color_whiter (GdkRGBA *color)
+{
+ const GdkRGBA white = { 1.0, 1.0, 1.0, 1.0 };
+
+ color->red = (color->red + (white).red) / 2;
+ color->green = (color->green + (white).green) / 2;
+ color->blue = (color->blue + (white).blue) / 2;
+}
diff --git a/libempathy-gtk/empathy-ui-utils.h b/libempathy-gtk/empathy-ui-utils.h
index 0b76d09..0ff637a 100644
--- a/libempathy-gtk/empathy-ui-utils.h
+++ b/libempathy-gtk/empathy-ui-utils.h
@@ -145,6 +145,9 @@ void empathy_send_file_from_uri_list (EmpathyContact *conta
void empathy_send_file_with_file_chooser (EmpathyContact *contact);
void empathy_receive_file_with_file_chooser (EmpathyFTHandler *handler);
+/* Misc */
+void empathy_make_color_whiter (GdkRGBA *color);
+
G_END_DECLS
#endif /* __EMPATHY_UI_UTILS_H__ */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]