[libgda/gtk3] GdaConfig: correctly compile without Gio
- From: Vivien Malerba <vivien src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgda/gtk3] GdaConfig: correctly compile without Gio
- Date: Wed, 9 Feb 2011 20:36:33 +0000 (UTC)
commit 445fee04453ed57d8dc50265633c0ef346734724
Author: Vivien Malerba <malerba gnome-db org>
Date: Wed Feb 2 17:28:43 2011 +0100
GdaConfig: correctly compile without Gio
libgda/gda-config.c | 32 ++++++++++++++++++--------------
1 files changed, 18 insertions(+), 14 deletions(-)
---
diff --git a/libgda/gda-config.c b/libgda/gda-config.c
index 83382d2..e758d89 100644
--- a/libgda/gda-config.c
+++ b/libgda/gda-config.c
@@ -1736,6 +1736,20 @@ internal_provider_free (InternalProvider *ip)
g_free (ip);
}
+static gboolean
+str_equal (const gchar *str1, const gchar *str2)
+{
+ if (str1 && str2) {
+ if (!strcmp (str1, str2))
+ return TRUE;
+ else
+ return FALSE;
+ }
+ else if (!str1 && !str2)
+ return TRUE;
+ return FALSE;
+}
+
static void
reload_dsn_configuration (void)
{
@@ -1758,12 +1772,16 @@ reload_dsn_configuration (void)
unique_instance->priv->dsn_list = NULL;
unique_instance->priv->emit_signals = FALSE;
+#ifdef HAVE_GIO
lock_notify_changes ();
+#endif
if (unique_instance->priv->system_file)
load_config_file (unique_instance->priv->system_file, TRUE);
if (unique_instance->priv->user_file)
load_config_file (unique_instance->priv->user_file, FALSE);
+#ifdef HAVE_GIO
unlock_notify_changes ();
+#endif
unique_instance->priv->emit_signals = TRUE;
new_dsn_list = unique_instance->priv->dsn_list;
@@ -1835,20 +1853,6 @@ reload_dsn_configuration (void)
*/
#ifdef HAVE_GIO
-static gboolean
-str_equal (const gchar *str1, const gchar *str2)
-{
- if (str1 && str2) {
- if (!strcmp (str1, str2))
- return TRUE;
- else
- return FALSE;
- }
- else if (!str1 && !str2)
- return TRUE;
- return FALSE;
-}
-
static void
conf_file_changed (G_GNUC_UNUSED GFileMonitor *mon, G_GNUC_UNUSED GFile *file,
G_GNUC_UNUSED GFile *other_file, GFileMonitorEvent event_type,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]