From 5f439e5e625a81145d3ec372cdb5caa654c269cc Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Tue, 18 Oct 2011 12:26:00 -0400
Subject: Trivial little cleanups.
To synchronize with the "wip/gsettings" branch.
Mostly just removing unneeded "gconf-bridge.h" includes.
---
capplet/anjal-settings-main.c | 1 -
capplet/settings/mail-capplet-shell.c | 1 -
2 files changed, 2 deletions(-)
(limited to 'capplet')
diff --git a/capplet/anjal-settings-main.c b/capplet/anjal-settings-main.c
index 2bc3268b58..99e0b4a282 100644
--- a/capplet/anjal-settings-main.c
+++ b/capplet/anjal-settings-main.c
@@ -38,7 +38,6 @@
#include <libedataserverui/e-passwords.h>
#include <mail/mail-mt.h>
#include "settings/mail-capplet-shell.h"
-#include <gconf/gconf-client.h>
#include <libedataserver/e-categories.h>
#ifdef G_OS_WIN32
diff --git a/capplet/settings/mail-capplet-shell.c b/capplet/settings/mail-capplet-shell.c
index 91a82b6757..6567da02ac 100644
--- a/capplet/settings/mail-capplet-shell.c
+++ b/capplet/settings/mail-capplet-shell.c
@@ -30,7 +30,6 @@
#include <gtk/gtkx.h>
#include <glib/gi18n.h>
#include <glib/gstdio.h>
-#include <gconf/gconf-client.h>
#include "mail-capplet-shell.h"
#include "mail-view.h"
#include <gdk/gdkkeysyms.h>
--
cgit
From 8c67e84f9bf1803108f7a004513e37c6ef22d41f Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Mon, 24 Oct 2011 09:42:48 +0200
Subject: Call g_thread_init() conditionally
---
capplet/anjal-settings-main.c | 2 ++
capplet/settings/mail-guess-servers.c | 2 ++
2 files changed, 4 insertions(+)
(limited to 'capplet')
diff --git a/capplet/anjal-settings-main.c b/capplet/anjal-settings-main.c
index 99e0b4a282..91e36904c7 100644
--- a/capplet/anjal-settings-main.c
+++ b/capplet/anjal-settings-main.c
@@ -167,8 +167,10 @@ main (gint argc,
if (!gtk_init_with_args (&argc, &argv, NULL, entries, NULL, &error))
g_error ("%s", error->message);
+ #if !GLIB_CHECK_VERSION(2,31,0)
if (!g_thread_get_initialized ())
g_thread_init (NULL);
+ #endif
e_passwords_init ();
categories_icon_theme_hack ();
diff --git a/capplet/settings/mail-guess-servers.c b/capplet/settings/mail-guess-servers.c
index 0b144940e9..0b15271a88 100644
--- a/capplet/settings/mail-guess-servers.c
+++ b/capplet/settings/mail-guess-servers.c
@@ -343,7 +343,9 @@ main (gint argc,
gchar **argv)
{
EmailProvider *provider;
+ #if !GLIB_CHECK_VERSION(2,31,0)
g_thread_init (NULL);
+ #endif
g_type_init ();
provider = g_new0 (EmailProvider, 1);
--
cgit