0dccbf7e2c
Copy from home:vuntz:branches:GNOME:Factory/evolution via accept of submit request 44643 revision 2. Request was accepted with message: ok OBS-URL: https://build.opensuse.org/request/show/44643 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/evolution?expand=0&rev=86
43 lines
1.3 KiB
Diff
43 lines
1.3 KiB
Diff
commit 5c49c70d5568a9a68daa5facaa531ab317d1f005
|
|
Author: Fridrich Štrba <fridrich.strba@bluewin.ch>
|
|
Date: Thu Aug 5 01:01:19 2010 +0200
|
|
|
|
We are not using dbus-glib anymore, don't call dbus_g_thread_init
|
|
|
|
diff --git a/calendar/gui/alarm-notify/notify-main.c b/calendar/gui/alarm-notify/notify-main.c
|
|
index 2696119..799229a 100644
|
|
--- a/calendar/gui/alarm-notify/notify-main.c
|
|
+++ b/calendar/gui/alarm-notify/notify-main.c
|
|
@@ -57,7 +57,6 @@ main (gint argc, gchar **argv)
|
|
textdomain (GETTEXT_PACKAGE);
|
|
|
|
g_thread_init (NULL);
|
|
- dbus_g_thread_init ();
|
|
|
|
#ifdef G_OS_WIN32
|
|
path = g_build_path (";", _e_get_bindir (), g_getenv ("PATH"), NULL);
|
|
diff --git a/capplet/anjal-settings-main.c b/capplet/anjal-settings-main.c
|
|
index e789f91..ec1019d 100644
|
|
--- a/capplet/anjal-settings-main.c
|
|
+++ b/capplet/anjal-settings-main.c
|
|
@@ -225,7 +225,6 @@ main (gint argc, gchar *argv[])
|
|
|
|
if (!g_thread_get_initialized ())
|
|
g_thread_init (NULL);
|
|
- dbus_g_thread_init ();
|
|
|
|
client = gconf_client_get_default();
|
|
|
|
diff --git a/shell/main.c b/shell/main.c
|
|
index a525262..82d6e6a 100644
|
|
--- a/shell/main.c
|
|
+++ b/shell/main.c
|
|
@@ -492,7 +492,6 @@ main (gint argc, gchar **argv)
|
|
g_type_init ();
|
|
if (!g_thread_get_initialized ())
|
|
g_thread_init (NULL);
|
|
- dbus_g_thread_init ();
|
|
|
|
#ifdef G_OS_WIN32
|
|
path = g_build_path (";", _e_get_bindir (), g_getenv ("PATH"), NULL);
|