Fix the text type box parsing bug.

Use the kept_in_safe function to get the filename of the text data
Without that function, the parser couldn't find the correct data file.

Change-Id: If4aea2a0445192664523dfd3cab914f01c15614a

diff --git a/packaging/liblivebox-viewer.spec b/packaging/liblivebox-viewer.spec
index 82c93d6..dc9ba15 100644 (file)
--- a/packaging/liblivebox-viewer.spec
+++ b/packaging/liblivebox-viewer.spec
@@ -1,6 +1,6 @@
 Name: liblivebox-viewer
 Summary: Library for the development of a livebox viewer
-Version: 0.8.10
+Version: 0.8.11
 Release: 1
 Group: main/app
 License: Flora License

diff --git a/src/client.c b/src/client.c
index 93dceaf..119ec55 100644 (file)
--- a/src/client.c
+++ b/src/client.c
@@ -241,7 +241,7 @@ static struct packet *master_lb_updated(pid_t pid, int handle, const struct pack
 
        if (lb_text_lb(handler)) {
                lb_set_size(handler, lb_w, lb_h);
-               ret = parse_desc(handler, util_uri_to_path(id), 0);
+               ret = parse_desc(handler, livebox_filename(handler), 0);
                /*!
                 * \note
                 * DESC parser will call the "text event callback".

diff --git a/src/fb.c b/src/fb.c
index 76d8081..1e687ef 100644 (file)
--- a/src/fb.c
+++ b/src/fb.c
@@ -158,7 +158,7 @@ static inline int sync_for_file(struct fb_info *info)
        return 0;
 }
 
-static inline int sync_for_pixmap(struct fb_info *info)
+static inline __attribute__((always_inline)) int sync_for_pixmap(struct fb_info *info)
 {
        struct buffer *buffer;
        XShmSegmentInfo si;

diff --git a/src/livebox.c b/src/livebox.c
index 9ec8c4a..ae5ac41 100644 (file)
--- a/src/livebox.c
+++ b/src/livebox.c
@@ -110,7 +110,7 @@ static inline void default_pd_destroyed_cb(struct livebox *handler, int ret, voi
        DbgPrint("Default PD destroyed event handler: %d\n", ret);
 }
 
-static inline struct cb_info *create_cb_info(ret_cb_t cb, void *data)
+static inline __attribute__((always_inline)) struct cb_info *create_cb_info(ret_cb_t cb, void *data)
 {
        struct cb_info *info;