From 1eb4c437ac2d9ded3910faf180326722667c693b Mon Sep 17 00:00:00 2001 From: Soohye Shin Date: Mon, 13 Apr 2015 17:19:15 +0900 Subject: [PATCH] bug fix for loading gallery album Change-Id: Iefe9d647e3ea0ca07bac797c0266fcd84e299380 Signed-off-by: Soohye Shin --- src/Bus.cpp | 10 +++++----- src/Bus.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Bus.cpp b/src/Bus.cpp index b39f85a..885ee99 100644 --- a/src/Bus.cpp +++ b/src/Bus.cpp @@ -28,7 +28,7 @@ struct SBus { CBus::SCallback cb; }; -bool CBus::t_GetContent(SContent *content) +bool CBus::t_GetContent(GVariantIter *it, SContent *content) { ASSERT(content); @@ -36,7 +36,7 @@ bool CBus::t_GetContent(SContent *content) const gchar *thumbnail; gboolean r; - r = g_variant_iter_next(Iter(), "(ys)", &type, &thumbnail); + r = g_variant_iter_next(it, "(ys)", &type, &thumbnail); if (!r) return false; @@ -46,6 +46,7 @@ bool CBus::t_GetContent(SContent *content) return true; } + bool CBus::t_GetContentArray(SContent contents[], int arraymax, int *cnt) { ASSERT(contents); @@ -61,14 +62,12 @@ bool CBus::t_GetContentArray(SContent contents[], int arraymax, int *cnt) g_variant_iter_init(&_it, val); for (i = 0; i < arraymax; i++) { - if (t_GetContent(&contents[i]) == false) + if (t_GetContent(&_it, &contents[i]) == false) break; } if (cnt) *cnt = i; - - g_variant_unref(val); } else { _ERR("Not array"); @@ -78,6 +77,7 @@ bool CBus::t_GetContentArray(SContent contents[], int arraymax, int *cnt) return i ? true : false; } + void CBus::t_ReleaseContentArray(SContent contents[], int arraymax) { int i; diff --git a/src/Bus.h b/src/Bus.h index be508fa..fa14cee 100644 --- a/src/Bus.h +++ b/src/Bus.h @@ -112,8 +112,8 @@ private: struct SBus *m; protected: - bool t_GetContent(SContent *content); bool t_GetContentArray(SContent contents[], int arraymax, int *cnt); + bool t_GetContent(GVariantIter *it, SContent *content); void t_ReleaseContentArray(SContent contents[], int arraymax); virtual bool t_OnEvent(const char *method, GVariant *param); -- 2.7.4