Changeset 2099

Timestamp:

06/08/07 15:33:43 (1 year ago)

Author:

dgollub

Message:

Changed libgnokii configuration internally. This fixes conflicts
with local file configuration like ~/.gnokiirc or /etc/gnokiirc
Some of the gnokii function are marked as deperecated.
Ignore the warning for now ... libgnokii we hopefully provide
a libfunction for this quite soon.

Files:

• plugins/gnokii-sync/build/linux/osync_build.py (modified) (1 diff)
• plugins/gnokii-sync/src/gnokii_config.c (modified) (7 diffs)
• plugins/gnokii-sync/src/gnokii_config.h (modified) (1 diff)
• plugins/gnokii-sync/src/gnokii_sync.c (modified) (3 diffs)
• plugins/gnokii-sync/src/gnokii_sync.h (modified) (2 diffs)

plugins/gnokii-sync/build/linux/osync_build.py

@@ -37 +37 @@
-        env.ParseConfig('pkg-config --cflags --libs gnokii')
-        env.Append(CCFLAGS = r'-I.')
-
+
+
-        env.Append(CCFLAGS = r'-DVERSION="\"' + config.version + r'\""')
-        

plugins/gnokii-sync/src/gnokii_config.c

@@ -21 +21 @@
-#include "gnokii_sync.h"
-
-/* Set connection types
- */
-void parse_connection_type(char *str, gn_config *config) {
-
-        if (!strcasecmp(str, "bluetooth"))
-                config->connection_type = GN_CT_Bluetooth;
-        else if (!strcasecmp(str, "irda"))
-                config->connection_type = GN_CT_Irda;
-        else if (!strcasecmp(str, "dku2"))
-                config->connection_type = GN_CT_DKU2;
-        else if (!strcasecmp(str, "dau9p"))
-                config->connection_type = GN_CT_DAU9P;
-        else if (!strcasecmp(str, "dlr3p"))
-                config->connection_type = GN_CT_DLR3P;
-        else if (!strcasecmp(str, "serial"))
-                config->connection_type = GN_CT_Serial;
-        else if (!strcasecmp(str, "infrared"))
-                config->connection_type = GN_CT_Infrared;
-        else if (!strcasecmp(str, "tekram"))
-                config->connection_type = GN_CT_Tekram;
-        else if (!strcasecmp(str, "tcp"))
-                config->connection_type = GN_CT_TCP;
-        else if (!strcasecmp(str, "m2bus"))
-                config->connection_type = GN_CT_M2BUS;
-        else if (!strcasecmp(str, "dku2libusb"))
-                config->connection_type = GN_CT_DKU2LIBUSB;
-        else
-                config->connection_type = GN_CT_NONE;
-}
-
-/* Parse config file of gnokii plugin 
- *
@@ -57 +27 @@
- * ReturnVal: false     on error
- */
-gn_config *config
+struct gn_statemachine *state
-{
-
+
+
-        char *str = NULL;
+        char **lines = malloc(sizeof(char*) * 10);
+        memset(lines, 0, sizeof(char*) * 10);
-        xmlDocPtr doc;
-        xmlNodePtr cur;
@@ -90 +63 @@
-        cur = cur->xmlChildrenNode;
-
+        lines[i] = g_strdup("[global]");
+
-        while (cur != NULL) {
-                str = (char *) xmlNodeGetContent(cur);
@@ -95 +70 @@
-                if (str) {
-                        if (!xmlStrcmp(cur->name, (const xmlChar *) "model"))
-strncpy(config->model, str, strlen(str)
+lines[++i] = g_strdup_printf("model = %s", str
-        
-                        if (!xmlStrcmp(cur->name, (const xmlChar *) "port"))
-strncpy(config->port_device, str, strlen(str)
+lines[++i] = g_strdup_printf("port = %s", str
-
-
-
-
-
+
+
-
-                        // rfcomm channel
-
-
-
+
+
-
-                        // check for debug option of libgnokii
-                        if (!xmlStrcmp(cur->name, (const xmlChar *) "debug")) {
-if (!strcasecmp(str, "on"))
-       gn_log_debug_mask = GN_LOG_T_STDERR;    // debug output to stderr
+lines[++i] = g_strdup("[logging]");
+lines[++i] = g_strdup_printf("debug = %s", str);
-                        }
-                        g_free(str);
@@ -121 +93 @@
-        }
-
+        /* TODO: adapt error handling to return value of gn_cfg_phone_load()
-        if (!strlen(config->model)) {
-                osync_error_set(error, OSYNC_ERROR_GENERIC, "Model is not set in configuration");
@@ -138 +111 @@
-                return FALSE;
-        }
+        */
-
+        gn_cfg_memory_read(lines);
+        gn_cfg_phone_load(NULL, state); 
+
+        for (i=0; lines[i] != NULL; i++)
+                g_free(lines[i]);
+
+        g_free(lines);
-
-        xmlFreeDoc(doc);
@@ -145 +126 @@
-}
-
-/* Fill the statemachine struct for libgnokii with:
- * model, port (serial connection) or MAC address (bluetooth) and connection type.
- * This is required for the cellphone connection. 
- *
- */
-void gnokii_config_state(struct gn_statemachine *state, gn_config *config) {
-
-        /* model */
-        strncpy(state->config.model, config->model, GN_MODEL_MAX_LENGTH);
-
-        /* port (bluetooth: destination mac address) */
-        strncpy(state->config.port_device, config->port_device, GN_DEVICE_NAME_MAX_LENGTH);
-
-        /* connection type - gn_connection_type */
-        state->config.connection_type = config->connection_type; 
-
-        /* rfcomm channel */
-        state->config.rfcomm_cn = config->rfcomm_cn;
-        
-}
-

plugins/gnokii-sync/src/gnokii_config.h

@@ -21 +21 @@
-#include <gnokii.h>
-
-
-
+
-

plugins/gnokii-sync/src/gnokii_sync.c

@@ -24 +24 @@
-        osync_trace(TRACE_ENTRY, "%s()", __func__);
-
-        if (env->config)
-                g_free(env->config);
-
-        if (env->state)
-                g_free(env->state);
@@ -165 +162 @@
-
-        env->sinks = NULL;
-        env->config = malloc(sizeof(gn_config));
-        g_assert(env->config != NULL);
-        memset(env->config, 0, sizeof(gn_config));
-
-        env->state = (struct gn_statemachine *) malloc(sizeof(struct gn_statemachine));
@@ -173 +167 @@
-        memset(env->state, 0, sizeof(struct gn_statemachine));
-
-
-
-
+
-                free_gnokiienv(env);
-                return NULL;
-        }
-        
-        // fill state structure with connection settings required by libgnokii
-        gnokii_config_state(env->state, env->config);
-
-        // init the contact sink
-        OSyncObjTypeSink *contact_sink = NULL; 

plugins/gnokii-sync/src/gnokii_sync.h

@@ -34 +34 @@
-#include <opensync/opensync-version.h>
-
-
-#include "gnokii_config.h"
-#include "gnokii_comm.h"
@@ -43 +42 @@
-typedef struct gnokii_environment {
-        GList                   *sinks; // gnokii_sinkenv
-        gn_config               *config;
-        struct gn_statemachine  *state;
-