Init empathy for megaphone, nothere and check-main.

svn path=/trunk/; revision=1972

diff --git a/megaphone/src/megaphone-applet.c b/megaphone/src/megaphone-applet.c
index f25777eb383ad72a5ab0eb279142c12acf3b420c..65bd4ef4b016d7e7d8afc23c7293ee09b21eb2dc 100644 (file)
--- a/megaphone/src/megaphone-applet.c
+++ b/megaphone/src/megaphone-applet.c
@@ -103,6 +103,7 @@ megaphone_applet_class_init (MegaphoneAppletClass *class)
        object_class->finalize = megaphone_applet_finalize;
 
        g_type_class_add_private (object_class, sizeof (MegaphoneAppletPriv));
        object_class->finalize = megaphone_applet_finalize;
 
        g_type_class_add_private (object_class, sizeof (MegaphoneAppletPriv));

+       empathy_gtk_init ();

 }
 
 static void
 }
 
 static void

diff --git a/nothere/src/nothere-applet.c b/nothere/src/nothere-applet.c
index f2adb0b9f5cc8203373a7c8fb42b01197f8680ee..243272e67df10723aeef6f5b208ec67dedd95c4c 100644 (file)
--- a/nothere/src/nothere-applet.c
+++ b/nothere/src/nothere-applet.c
@@ -29,6 +29,7 @@
 
 #include <libmissioncontrol/mission-control.h>
 #include <libempathy-gtk/empathy-presence-chooser.h>
 
 #include <libmissioncontrol/mission-control.h>
 #include <libempathy-gtk/empathy-presence-chooser.h>

+#include <libempathy-gtk/empathy-ui-utils.h>

 
 #include "nothere-applet.h"
 
 
 #include "nothere-applet.h"
 


@@ -54,8 +55,7 @@ nothere_applet_class_init (NotHereAppletClass *class)
 {
        GTK_OBJECT_CLASS (class)->destroy = nothere_applet_destroy;
 
 {
        GTK_OBJECT_CLASS (class)->destroy = nothere_applet_destroy;
 

-       gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (),
-                       PKGDATADIR G_DIR_SEPARATOR_S "icons");
+       empathy_gtk_init ();

 }
 
 static gboolean
 }
 
 static gboolean

diff --git a/tests/check-main.c b/tests/check-main.c
index 886e1e57009db5023556f4fbaceba84a0b0950b3..270298b960041ceb209882d821491ea41e8c5c1e 100644 (file)
--- a/tests/check-main.c
+++ b/tests/check-main.c
@@ -34,6 +34,7 @@ main (void)
 
     check_helpers_init ();
     g_type_init ();
 
     check_helpers_init ();
     g_type_init ();

+    empathy_init ();

 
     s = make_libempathy_suite ();
     sr = srunner_create (s);
 
     s = make_libempathy_suite ();
     sr = srunner_create (s);