[empathy] Load the CSS in all empathy-* binaries
- From: Guillaume Desmottes <gdesmott src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy] Load the CSS in all empathy-* binaries
- Date: Thu, 24 May 2012 10:57:48 +0000 (UTC)
commit bf821168dfb8c2e835cdf57a1c313841ee0dd763
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date: Thu May 24 12:06:36 2012 +0200
Load the CSS in all empathy-* binaries
https://bugzilla.gnome.org/show_bug.cgi?id=669473
src/empathy-auth-client.c | 3 +++
src/empathy-call-window.c | 2 ++
src/empathy-chat-window.c | 2 ++
src/empathy-debug-window.c | 2 ++
src/empathy-roster-window.c | 2 ++
5 files changed, 11 insertions(+), 0 deletions(-)
---
diff --git a/src/empathy-auth-client.c b/src/empathy-auth-client.c
index 3228738..837988e 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 d9641fd..73768f9 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 6de6db1..2ca19da 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 57549f4..eeb7692 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 bce5eb3..5b9842d 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);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]