aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2012-05-24 18:06:36 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2012-05-24 18:31:01 +0800
commitbf821168dfb8c2e835cdf57a1c313841ee0dd763 (patch)
treeb145d949b6a736370e76b762c445bcd53f600d97 /src
parentd62ff957e10bdfb92b99608310ae9b96676ea4fa (diff)
downloadgsoc2013-empathy-bf821168dfb8c2e835cdf57a1c313841ee0dd763.tar
gsoc2013-empathy-bf821168dfb8c2e835cdf57a1c313841ee0dd763.tar.gz
gsoc2013-empathy-bf821168dfb8c2e835cdf57a1c313841ee0dd763.tar.bz2
gsoc2013-empathy-bf821168dfb8c2e835cdf57a1c313841ee0dd763.tar.lz
gsoc2013-empathy-bf821168dfb8c2e835cdf57a1c313841ee0dd763.tar.xz
gsoc2013-empathy-bf821168dfb8c2e835cdf57a1c313841ee0dd763.tar.zst
gsoc2013-empathy-bf821168dfb8c2e835cdf57a1c313841ee0dd763.zip
Load the CSS in all empathy-* binaries
https://bugzilla.gnome.org/show_bug.cgi?id=669473
Diffstat (limited to 'src')
-rw-r--r--src/empathy-auth-client.c3
-rw-r--r--src/empathy-call-window.c2
-rw-r--r--src/empathy-chat-window.c2
-rw-r--r--src/empathy-debug-window.c2
-rw-r--r--src/empathy-roster-window.c2
5 files changed, 11 insertions, 0 deletions
diff --git a/src/empathy-auth-client.c b/src/empathy-auth-client.c
index 3228738f4..837988e2b 100644
--- a/src/empathy-auth-client.c
+++ b/src/empathy-auth-client.c
@@ -309,6 +309,9 @@ main (int argc,
gtk_window_set_default_icon_name ("empathy");
textdomain (GETTEXT_PACKAGE);
+ /* There is no 'main' UI window so just use the default GdkScreen */
+ empathy_set_rss_provider (NULL);
+
#ifdef ENABLE_DEBUG
/* Set up debug sender */
debug_sender = tp_debug_sender_dup ();
diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c
index d9641fdf9..73768f9c5 100644
--- a/src/empathy-call-window.c
+++ b/src/empathy-call-window.c
@@ -1615,6 +1615,8 @@ empathy_call_window_init (EmpathyCallWindow *self)
"menupreviewswap", "activate", empathy_call_window_swap_camera_cb,
NULL);
+ empathy_set_rss_provider (GTK_WIDGET (self));
+
/* FIXME: we should use a stock "OSD" style class for the toolbar,
* once it's available in GTK+/Adwaita.
*/
diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c
index 6de6db140..2ca19dad2 100644
--- a/src/empathy-chat-window.c
+++ b/src/empathy-chat-window.c
@@ -2307,6 +2307,8 @@ empathy_chat_window_init (EmpathyChatWindow *window)
g_object_ref (priv->ui_manager);
g_object_unref (gui);
+ empathy_set_rss_provider (GTK_WIDGET (priv->dialog));
+
priv->gsettings_chat = g_settings_new (EMPATHY_PREFS_CHAT_SCHEMA);
priv->gsettings_notif = g_settings_new (EMPATHY_PREFS_NOTIFICATIONS_SCHEMA);
priv->gsettings_ui = g_settings_new (EMPATHY_PREFS_UI_SCHEMA);
diff --git a/src/empathy-debug-window.c b/src/empathy-debug-window.c
index 57549f4fc..eeb7692a8 100644
--- a/src/empathy-debug-window.c
+++ b/src/empathy-debug-window.c
@@ -1855,6 +1855,8 @@ am_prepared_cb (GObject *am,
g_clear_error (&error);
}
+ empathy_set_rss_provider (GTK_WIDGET (object));
+
gtk_window_set_title (GTK_WINDOW (object), _("Debug Window"));
gtk_window_set_default_size (GTK_WINDOW (object), 800, 400);
empathy_geometry_bind (GTK_WINDOW (object), "debug-window");
diff --git a/src/empathy-roster-window.c b/src/empathy-roster-window.c
index bce5eb3c6..5b9842dcc 100644
--- a/src/empathy-roster-window.c
+++ b/src/empathy-roster-window.c
@@ -2144,6 +2144,8 @@ empathy_roster_window_init (EmpathyRosterWindow *self)
self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
EMPATHY_TYPE_ROSTER_WINDOW, EmpathyRosterWindowPriv);
+ empathy_set_rss_provider (GTK_WIDGET (self));
+
self->priv->gsettings_ui = g_settings_new (EMPATHY_PREFS_UI_SCHEMA);
self->priv->gsettings_contacts = g_settings_new (EMPATHY_PREFS_CONTACTS_SCHEMA);