Deprecate le funzioni Solipa::set_gdaex a ::get_gdaex.

diff --git a/src/ooo.c b/src/ooo.c
index 0fc28c7b6f84ad9bd10bd87f0bf0da0a6b6ee092..6d8adbff039cb8e7edfb2b532c3af519794b2755 100644 (file)
--- a/src/ooo.c
+++ b/src/ooo.c
@@ -402,12 +402,6 @@ solipa_ooo_dispose (GObject *gobject)
                        Py_Finalize ();
                }
 
-       /*if (priv->gdaex)
-               {
-                       g_object_unref (priv->gdaex);
-                       priv->gdaex = NULL;
-               }*/
-
        GObjectClass *parent_class = g_type_class_peek_parent (G_OBJECT_GET_CLASS (gobject));
        parent_class->dispose (gobject);
 }

diff --git a/src/solipa.c b/src/solipa.c
index 44e0f3be129d44026bff1f7e8dae3b12913a046f..b3c1f2529d4928272bfce0b6fa84fedf246223ae 100644 (file)
--- a/src/solipa.c
+++ b/src/solipa.c
@@ -56,8 +56,6 @@ struct _SolipaPrivate
                gchar *camel_tmpdir;
                CamelSession *camel_session;
 
-               GdaEx *gdaex;
-
                gchar *guidir;
                gchar *guifile;
                GtkBuilder *gtkbuilder;
@@ -185,7 +183,6 @@ solipa_set_from_keyfile (Solipa *solipa, const gchar *filename)
        gsize n_params;
 
        gchar *cnc_string;
-       GdaEx *gdaex;
 
        g_return_if_fail (IS_SOLIPA (solipa));
        g_return_if_fail (filename == NULL);
@@ -202,25 +199,6 @@ solipa_set_from_keyfile (Solipa *solipa, const gchar *filename)
                        return;
                }
        g_error_free (error);
-
-       /* db params */
-       error = NULL;
-       cnc_string = g_key_file_get_value (config, "SOLIPA_DB", "cnc_string", &error);
-       if (cnc_string == NULL)
-               {
-                       g_warning ("Error on loading solipa db config from file «%s»: %s.",
-                                  error != NULL && error->message != NULL ? error->message : "no details");
-                       return;
-               }
-
-       gdaex = gdaex_new_from_string (cnc_string);
-       if (gdaex == NULL)
-               {
-                       g_warning ("Error on database connection with string: %s", cnc_string);
-               }
-       solipa_set_gdaex (solipa, gdaex);
-
-       g_error_free (error);
 }
 
 CamelSession
@@ -235,29 +213,17 @@ CamelSession
        return priv->camel_session;
 }
 
+G_DEPRECATED
 void
 solipa_set_gdaex (Solipa *solipa, GdaEx *gdaex)
 {
-       SolipaPrivate *priv;
-
-       g_return_if_fail (IS_SOLIPA (solipa));
-       g_return_if_fail (IS_GDAEX (gdaex));
-
-       priv = SOLIPA_GET_PRIVATE (solipa);
-
-       priv->gdaex = gdaex;
 }
 
+G_DEPRECATED
 GdaEx
 *solipa_get_gdaex (Solipa *solipa)
 {
-       SolipaPrivate *priv;
-
-       g_return_val_if_fail (IS_SOLIPA (solipa), NULL);
-
-       priv = SOLIPA_GET_PRIVATE (solipa);
-
-       return priv->gdaex;
+       return NULL;
 }
 
 const gchar
@@ -325,12 +291,6 @@ solipa_dispose (GObject *gobject)
        Solipa *solipa = (Solipa *)gobject;
        SolipaPrivate *priv = SOLIPA_GET_PRIVATE (solipa);
 
-       if (priv->gdaex)
-               {
-                       g_object_unref (priv->gdaex);
-                       priv->gdaex = NULL;
-               }
-
        if (priv->gtkbuilder)
                {
                        g_object_unref (priv->gtkbuilder);

diff --git a/src/solipa.h b/src/solipa.h
index 4dca636cf50dd541ff5f2bc5c81431ac2142660e..4692bf812b0a896e9740d9fafa15d840cdfe7abc 100644 (file)
--- a/src/solipa.h
+++ b/src/solipa.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2011 Andrea Zagli <azagli@libero.it>
+ * Copyright (C) 2010-2015 Andrea Zagli <azagli@libero.it>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -26,8 +26,6 @@
 
 #include <camel/camel.h>
 
-#include <libgdaex/libgdaex.h>
-
 
 G_BEGIN_DECLS
 
@@ -62,7 +60,9 @@ void solipa_set_from_keyfile (Solipa *solipa, const gchar *filename);
 
 CamelSession *solipa_get_camel_session (Solipa *solipa);
 
+G_DEPRECATED
 void solipa_set_gdaex (Solipa *solipa, GdaEx *gdaex);
+G_DEPRECATED
 GdaEx *solipa_get_gdaex (Solipa *solipa);
 
 const gchar *solipa_get_guifile (Solipa *solipa);