From 3c643c4f48179643cdb7d486aa19b3c2bd76176f Mon Sep 17 00:00:00 2001
From: "Javier S. Pedro" <maemo@javispedro.com>
Date: Fri, 17 Aug 2012 17:01:05 +0200
Subject: adding new translucent option, release 1.2

---
 meego/Makefile             |  3 +--
 meego/meego-im-connector.c | 10 ++++++++--
 meego/meego-im-defs.h      |  2 ++
 meego/meego-im-proxy.c     |  2 +-
 4 files changed, 12 insertions(+), 5 deletions(-)

(limited to 'meego')

diff --git a/meego/Makefile b/meego/Makefile
index 4992cad..86dcce4 100644
--- a/meego/Makefile
+++ b/meego/Makefile
@@ -6,7 +6,7 @@ MEEGOIMCOMMON_TARGET:=libmeego-im-common.a
 MEEGOIMCOMMON_OBJS:=meego-im-connector.o meego-imcontext-dbus.o meego-im-proxy.o \
 	qt-keysym-map.o qt-translate.o
 MEEGOIMCOMMON_PKGCONFIG:=x11 dbus-glib-1 QtCore QtGui
-MEEGOIMCOMMON_CFLAGS:=$(shell pkg-config --cflags $(MEEGOIMCOMMON_PKGCONFIG)) -DQT_NO_KEYWORDS -std=c99
+MEEGOIMCOMMON_CFLAGS:=$(shell pkg-config --cflags $(MEEGOIMCOMMON_PKGCONFIG)) -DQT_NO_KEYWORDS -std=c99 -DG_LOG_DOMAIN=\"meego-im-common\"
 MEEGOIMCOMMON_CXXFLAGS:=$(shell pkg-config --cflags $(MEEGOIMCOMMON_PKGCONFIG))
 
 all: $(MEEGOIMCOMMON_TARGET)
@@ -24,4 +24,3 @@ clean:
 	rm -f $(MEEGOIMCOMMON_TARGET) *.o
 
 .PHONY: all clean
-
diff --git a/meego/meego-im-connector.c b/meego/meego-im-connector.c
index c1ca0de..00726a8 100644
--- a/meego/meego-im-connector.c
+++ b/meego/meego-im-connector.c
@@ -80,10 +80,16 @@ get_dbus_address()
                            G_TYPE_STRING, MALIIT_SERVER_ADDRESS_PROPERTY,
                            G_TYPE_INVALID,
                            G_TYPE_VALUE, &value, G_TYPE_INVALID)) {
+		if (error) {
+			g_warning("%s: %s", __PRETTY_FUNCTION__, error->message);
+			g_error_free(error);
+		} else {
+			g_warning("%s: Could not call the Maliit address server",
+			          __PRETTY_FUNCTION__);
+		}
 
-        g_warning("%s: %s", __PRETTY_FUNCTION__, error->message);
-        g_error_free(error);
 		// Let's try PR1.2 address if PR1.3/Maliit was not found.
+		g_debug("%s: Could not obtain Maliit server address, trying old address");
 		return g_strdup(MEEGO_IM_SOCKET_PATH);
     }
 
diff --git a/meego/meego-im-defs.h b/meego/meego-im-defs.h
index 85443bc..6fc621d 100644
--- a/meego/meego-im-defs.h
+++ b/meego/meego-im-defs.h
@@ -88,4 +88,6 @@ typedef struct _MeegoImKeyEvent
 	char *text;
 } MeegoImKeyEvent;
 
+static const char * const MeegoImInfoTranslucent = "maliit-translucent-input-method";
+
 #endif
diff --git a/meego/meego-im-proxy.c b/meego/meego-im-proxy.c
index 5326d3b..b1914fe 100644
--- a/meego/meego-im-proxy.c
+++ b/meego/meego-im-proxy.c
@@ -23,7 +23,7 @@
 #include "meego-im-proxy-glue.h"
 #include "debug.h"
 
-G_DEFINE_TYPE(MeegoIMProxy, meego_im_proxy, G_TYPE_OBJECT);
+G_DEFINE_TYPE(MeegoIMProxy, meego_im_proxy, G_TYPE_OBJECT)
 
 #define MEEGO_IM_OBJECT_PATH "/com/meego/inputmethod/uiserver1"
 #define MEEGO_IM_SERVICE_INTERFACE "com.meego.inputmethod.uiserver1"
-- 
cgit v1.2.3