summaryrefslogtreecommitdiff
path: root/legacy/ethumb
diff options
context:
space:
mode:
authorGustavo Sverzut Barbieri <barbieri@gmail.com>2009-09-17 14:31:29 +0000
committerGustavo Sverzut Barbieri <barbieri@gmail.com>2009-09-17 14:31:29 +0000
commitacc688873b214613ffcf37c7ff4fc986fbca87fd (patch)
treef8ad2fbaf751eb2eac6017a856add263dc6b3c00 /legacy/ethumb
parentbea73e88bd2fd679bd52716b0b4fd8813f875019 (diff)
logging: remove trailing \n
SVN revision: 42546
Diffstat (limited to 'legacy/ethumb')
-rw-r--r--legacy/ethumb/src/lib/Ethumb.c50
-rw-r--r--legacy/ethumb/src/lib/client/Ethumb_Client.c55
2 files changed, 53 insertions, 52 deletions
diff --git a/legacy/ethumb/src/lib/Ethumb.c b/legacy/ethumb/src/lib/Ethumb.c
index ef040c4546..944c180121 100644
--- a/legacy/ethumb/src/lib/Ethumb.c
+++ b/legacy/ethumb/src/lib/Ethumb.c
@@ -78,7 +78,7 @@ _ethumb_plugin_list_cb(Eina_Module *m, void *data __UNUSED__)
78 file = eina_module_file_get(m); 78 file = eina_module_file_get(m);
79 if (!eina_module_load(m)) 79 if (!eina_module_load(m))
80 { 80 {
81 ERR("could not load module \"%s\": %s\n", 81 ERR("could not load module \"%s\": %s",
82 file, eina_error_msg_get(eina_error_get())); 82 file, eina_error_msg_get(eina_error_get()));
83 return EINA_FALSE; 83 return EINA_FALSE;
84 } 84 }
@@ -86,7 +86,7 @@ _ethumb_plugin_list_cb(Eina_Module *m, void *data __UNUSED__)
86 plugin_get = eina_module_symbol_get(m, "ethumb_plugin_get"); 86 plugin_get = eina_module_symbol_get(m, "ethumb_plugin_get");
87 if (!plugin_get) 87 if (!plugin_get)
88 { 88 {
89 ERR("could not find ethumb_plugin_get() in module \"%s\": %s\n", 89 ERR("could not find ethumb_plugin_get() in module \"%s\": %s",
90 file, eina_error_msg_get(eina_error_get())); 90 file, eina_error_msg_get(eina_error_get()));
91 eina_module_unload(m); 91 eina_module_unload(m);
92 return EINA_FALSE; 92 return EINA_FALSE;
@@ -95,15 +95,15 @@ _ethumb_plugin_list_cb(Eina_Module *m, void *data __UNUSED__)
95 plugin = plugin_get(); 95 plugin = plugin_get();
96 if (!plugin) 96 if (!plugin)
97 { 97 {
98 ERR("plugin \"%s\" failed to init.\n", file); 98 ERR("plugin \"%s\" failed to init.", file);
99 eina_module_unload(m); 99 eina_module_unload(m);
100 return EINA_FALSE; 100 return EINA_FALSE;
101 } 101 }
102 102
103 DBG("loaded plugin \"%s\" (%p) with extensions:\n", file, plugin); 103 DBG("loaded plugin \"%s\" (%p) with extensions:", file, plugin);
104 for (ext = plugin->extensions; *ext; ext++) 104 for (ext = plugin->extensions; *ext; ext++)
105 { 105 {
106 DBG(" extension \"%s\"\n", *ext); 106 DBG(" extension \"%s\"", *ext);
107 eina_hash_add(_plugins_ext, *ext, plugin); 107 eina_hash_add(_plugins_ext, *ext, plugin);
108 } 108 }
109 109
@@ -219,7 +219,7 @@ ethumb_new(void)
219 e = ecore_evas_get(ee); 219 e = ecore_evas_get(ee);
220 if (!e) 220 if (!e)
221 { 221 {
222 ERR("could not create ecore evas buffer\n"); 222 ERR("could not create ecore evas buffer");
223 return NULL; 223 return NULL;
224 } 224 }
225 225
@@ -229,7 +229,7 @@ ethumb_new(void)
229 o = ecore_evas_object_image_new(ee); 229 o = ecore_evas_object_image_new(ee);
230 if (!o) 230 if (!o)
231 { 231 {
232 ERR("could not create sub ecore evas buffer\n"); 232 ERR("could not create sub ecore evas buffer");
233 ecore_evas_free(ee); 233 ecore_evas_free(ee);
234 free(ethumb); 234 free(ethumb);
235 return NULL; 235 return NULL;
@@ -244,7 +244,7 @@ ethumb_new(void)
244 img = evas_object_image_add(sub_e); 244 img = evas_object_image_add(sub_e);
245 if (!img) 245 if (!img)
246 { 246 {
247 ERR("could not create source objects.\n"); 247 ERR("could not create source objects.");
248 ecore_evas_free(ee); 248 ecore_evas_free(ee);
249 free(ethumb); 249 free(ethumb);
250 return NULL; 250 return NULL;
@@ -257,7 +257,7 @@ ethumb_new(void)
257 ethumb->o = o; 257 ethumb->o = o;
258 ethumb->img = img; 258 ethumb->img = img;
259 259
260 DBG("ethumb=%p\n", ethumb); 260 DBG("ethumb=%p", ethumb);
261 261
262 return ethumb; 262 return ethumb;
263} 263}
@@ -473,14 +473,14 @@ ethumb_frame_set(Ethumb *e, const char *theme_file, const char *group, const cha
473 frame = calloc(1, sizeof(Ethumb_Frame)); 473 frame = calloc(1, sizeof(Ethumb_Frame));
474 if (!frame) 474 if (!frame)
475 { 475 {
476 ERR("could not allocate Ethumb_Frame structure.\n"); 476 ERR("could not allocate Ethumb_Frame structure.");
477 return EINA_FALSE; 477 return EINA_FALSE;
478 } 478 }
479 479
480 frame->edje = edje_object_add(e->sub_e); 480 frame->edje = edje_object_add(e->sub_e);
481 if (!frame->edje) 481 if (!frame->edje)
482 { 482 {
483 ERR("could not create edje frame object.\n"); 483 ERR("could not create edje frame object.");
484 _ethumb_frame_free(frame); 484 _ethumb_frame_free(frame);
485 e->frame = NULL; 485 e->frame = NULL;
486 return EINA_FALSE; 486 return EINA_FALSE;
@@ -489,7 +489,7 @@ ethumb_frame_set(Ethumb *e, const char *theme_file, const char *group, const cha
489 489
490 if (!edje_object_file_set(frame->edje, theme_file, group)) 490 if (!edje_object_file_set(frame->edje, theme_file, group))
491 { 491 {
492 ERR("could not load frame theme.\n"); 492 ERR("could not load frame theme.");
493 _ethumb_frame_free(frame); 493 _ethumb_frame_free(frame);
494 e->frame = NULL; 494 e->frame = NULL;
495 return EINA_FALSE; 495 return EINA_FALSE;
@@ -498,7 +498,7 @@ ethumb_frame_set(Ethumb *e, const char *theme_file, const char *group, const cha
498 edje_object_part_swallow(frame->edje, swallow, e->img); 498 edje_object_part_swallow(frame->edje, swallow, e->img);
499 if (!edje_object_part_swallow_get(frame->edje, swallow)) 499 if (!edje_object_part_swallow_get(frame->edje, swallow))
500 { 500 {
501 ERR("could not swallow image to edje frame.\n"); 501 ERR("could not swallow image to edje frame.");
502 _ethumb_frame_free(frame); 502 _ethumb_frame_free(frame);
503 e->frame = NULL; 503 e->frame = NULL;
504 return EINA_FALSE; 504 return EINA_FALSE;
@@ -722,7 +722,7 @@ ethumb_file_set(Ethumb *e, const char *path, const char *key)
722 DBG("ethumb=%p, path=%s, key=%s", e, path ? path : "", key ? key : ""); 722 DBG("ethumb=%p, path=%s, key=%s", e, path ? path : "", key ? key : "");
723 if (path && access(path, R_OK)) 723 if (path && access(path, R_OK))
724 { 724 {
725 ERR("couldn't access file \"%s\"\n", path); 725 ERR("couldn't access file \"%s\"", path);
726 return EINA_FALSE; 726 return EINA_FALSE;
727 } 727 }
728 728
@@ -807,7 +807,7 @@ _ethumb_generate_hash(const char *file)
807 } 807 }
808 md5out[2 * n] = '\0'; 808 md5out[2 * n] = '\0';
809 809
810 DBG("md5=%s, file=%s\n", md5out, file); 810 DBG("md5=%s, file=%s", md5out, file);
811 return eina_stringshare_add(md5out); 811 return eina_stringshare_add(md5out);
812} 812}
813 813
@@ -1046,14 +1046,14 @@ _ethumb_plugin_generate(Ethumb *e)
1046 ext = strrchr(e->src_path, '.'); 1046 ext = strrchr(e->src_path, '.');
1047 if (!ext) 1047 if (!ext)
1048 { 1048 {
1049 ERR("could not get extension for file \"%s\"\n", e->src_path); 1049 ERR("could not get extension for file \"%s\"", e->src_path);
1050 return EINA_FALSE; 1050 return EINA_FALSE;
1051 } 1051 }
1052 1052
1053 plugin = eina_hash_find(_plugins_ext, ext + 1); 1053 plugin = eina_hash_find(_plugins_ext, ext + 1);
1054 if (!plugin) 1054 if (!plugin)
1055 { 1055 {
1056 DBG("no plugin for extension: \"%s\"\n", ext + 1); 1056 DBG("no plugin for extension: \"%s\"", ext + 1);
1057 return EINA_FALSE; 1057 return EINA_FALSE;
1058 } 1058 }
1059 1059
@@ -1112,7 +1112,7 @@ ethumb_image_save(Ethumb *e)
1112 1112
1113 if (!e->thumb_path) 1113 if (!e->thumb_path)
1114 { 1114 {
1115 ERR("could not create file path...\n"); 1115 ERR("could not create file path...");
1116 return EINA_FALSE; 1116 return EINA_FALSE;
1117 } 1117 }
1118 1118
@@ -1121,7 +1121,7 @@ ethumb_image_save(Ethumb *e)
1121 free(dname); 1121 free(dname);
1122 if (!r) 1122 if (!r)
1123 { 1123 {
1124 ERR("could not create directory '%s'\n", dname); 1124 ERR("could not create directory '%s'", dname);
1125 return EINA_FALSE; 1125 return EINA_FALSE;
1126 } 1126 }
1127 1127
@@ -1131,7 +1131,7 @@ ethumb_image_save(Ethumb *e)
1131 1131
1132 if (!r) 1132 if (!r)
1133 { 1133 {
1134 ERR("could not save image.\n"); 1134 ERR("could not save image.");
1135 return EINA_FALSE; 1135 return EINA_FALSE;
1136 } 1136 }
1137 1137
@@ -1163,7 +1163,7 @@ _ethumb_image_load(Ethumb *e)
1163 error = evas_object_image_load_error_get(img); 1163 error = evas_object_image_load_error_get(img);
1164 if (error != EVAS_LOAD_ERROR_NONE) 1164 if (error != EVAS_LOAD_ERROR_NONE)
1165 { 1165 {
1166 ERR("could not load image '%s': %d\n", e->src_path, error); 1166 ERR("could not load image '%s': %d", e->src_path, error);
1167 return 0; 1167 return 0;
1168 } 1168 }
1169 1169
@@ -1239,7 +1239,7 @@ ethumb_generate(Ethumb *e, Ethumb_Generate_Cb finished_cb, const void *data, Ein
1239 1239
1240 if (e->finished_idler) 1240 if (e->finished_idler)
1241 { 1241 {
1242 ERR("thumbnail generation already in progress.\n"); 1242 ERR("thumbnail generation already in progress.");
1243 return EINA_FALSE; 1243 return EINA_FALSE;
1244 } 1244 }
1245 e->finished_cb = finished_cb; 1245 e->finished_cb = finished_cb;
@@ -1248,7 +1248,7 @@ ethumb_generate(Ethumb *e, Ethumb_Generate_Cb finished_cb, const void *data, Ein
1248 1248
1249 if (!e->src_path) 1249 if (!e->src_path)
1250 { 1250 {
1251 ERR("no file set.\n"); 1251 ERR("no file set.");
1252 ethumb_finished_callback_call(e, 0); 1252 ethumb_finished_callback_call(e, 0);
1253 return EINA_TRUE; 1253 return EINA_TRUE;
1254 } 1254 }
@@ -1259,7 +1259,7 @@ ethumb_generate(Ethumb *e, Ethumb_Generate_Cb finished_cb, const void *data, Ein
1259 1259
1260 if (!_ethumb_image_load(e)) 1260 if (!_ethumb_image_load(e))
1261 { 1261 {
1262 ERR("could not load input image.\n"); 1262 ERR("could not load input image.");
1263 ethumb_finished_callback_call(e, 0); 1263 ethumb_finished_callback_call(e, 0);
1264 return EINA_TRUE; 1264 return EINA_TRUE;
1265 } 1265 }
@@ -1293,7 +1293,7 @@ ethumb_exists(Ethumb *e)
1293 EINA_SAFETY_ON_TRUE_RETURN_VAL(r_src, 0); 1293 EINA_SAFETY_ON_TRUE_RETURN_VAL(r_src, 0);
1294 1294
1295 if (r_thumb && errno != ENOENT) 1295 if (r_thumb && errno != ENOENT)
1296 ERR("could not access file \"%s\": %s\n", e->thumb_path, strerror(errno)); 1296 ERR("could not access file \"%s\": %s", e->thumb_path, strerror(errno));
1297 else if (!r_thumb && thumb.st_mtime > src.st_mtime) 1297 else if (!r_thumb && thumb.st_mtime > src.st_mtime)
1298 r = EINA_TRUE; 1298 r = EINA_TRUE;
1299 1299
diff --git a/legacy/ethumb/src/lib/client/Ethumb_Client.c b/legacy/ethumb/src/lib/client/Ethumb_Client.c
index 3b421cc9ca..a9d2905634 100644
--- a/legacy/ethumb/src/lib/client/Ethumb_Client.c
+++ b/legacy/ethumb/src/lib/client/Ethumb_Client.c
@@ -91,6 +91,7 @@ static int _log_dom = -1;
91#define INF(...) EINA_LOG_DOM_INFO(_log_dom, __VA_ARGS__) 91#define INF(...) EINA_LOG_DOM_INFO(_log_dom, __VA_ARGS__)
92#define WRN(...) EINA_LOG_DOM_WARN(_log_dom, __VA_ARGS__) 92#define WRN(...) EINA_LOG_DOM_WARN(_log_dom, __VA_ARGS__)
93#define ERR(...) EINA_LOG_DOM_ERR(_log_dom, __VA_ARGS__) 93#define ERR(...) EINA_LOG_DOM_ERR(_log_dom, __VA_ARGS__)
94#define CRITICAL(...) EINA_LOG_DOM_CRIT(_log_dom, __VA_ARGS__)
94 95
95struct _Ethumb_Client 96struct _Ethumb_Client
96{ 97{
@@ -180,12 +181,12 @@ __dbus_callback_check_and_init(const char *file, int line, const char *function,
180{ 181{
181 if (!msg) 182 if (!msg)
182 { 183 {
183 ERR("%s:%d:%s() callback without message arguments!\n", 184 ERR("%s:%d:%s() callback without message arguments!",
184 file, line, function); 185 file, line, function);
185 186
186 if (err) 187 if (err)
187 ERR("%s:%d:%s() an error was reported by server: " 188 ERR("%s:%d:%s() an error was reported by server: "
188 "name=\"%s\", message=\"%s\"\n", 189 "name=\"%s\", message=\"%s\"",
189 file, line, function, err->name, err->message); 190 file, line, function, err->name, err->message);
190 191
191 return 0; 192 return 0;
@@ -193,7 +194,7 @@ __dbus_callback_check_and_init(const char *file, int line, const char *function,
193 194
194 if (!dbus_message_iter_init(msg, itr)) 195 if (!dbus_message_iter_init(msg, itr))
195 { 196 {
196 ERR("%s:%d:%s() could not init iterator.\n", 197 ERR("%s:%d:%s() could not init iterator.",
197 file, line, function); 198 file, line, function);
198 return 0; 199 return 0;
199 } 200 }
@@ -211,7 +212,7 @@ __dbus_iter_type_check(int type, int expected, const char *expected_name)
211 if (type == expected) 212 if (type == expected)
212 return 1; 213 return 1;
213 214
214 ERR("expected type %s (%c) but got %c instead!\n", 215 ERR("expected type %s (%c) but got %c instead!",
215 expected_name, expected, type); 216 expected_name, expected, type);
216 217
217 return 0; 218 return 0;
@@ -223,7 +224,7 @@ __dbus_iter_type_check(int type, int expected, const char *expected_name)
223 { \ 224 { \
224 if ((ptr) == NULL) \ 225 if ((ptr) == NULL) \
225 { \ 226 { \
226 ERR("%s == NULL!\n", #ptr); \ 227 CRITICAL("%s == NULL!", #ptr); \
227 return __VA_ARGS__; \ 228 return __VA_ARGS__; \
228 } \ 229 } \
229 } \ 230 } \
@@ -243,7 +244,7 @@ _ethumb_client_name_owner_changed(void *data, DBusMessage *msg)
243 DBUS_TYPE_STRING, &to, 244 DBUS_TYPE_STRING, &to,
244 DBUS_TYPE_INVALID)) 245 DBUS_TYPE_INVALID))
245 { 246 {
246 ERR("could not get NameOwnerChanged arguments: %s: %s\n", 247 ERR("could not get NameOwnerChanged arguments: %s: %s",
247 err.name, err.message); 248 err.name, err.message);
248 dbus_error_free(&err); 249 dbus_error_free(&err);
249 return; 250 return;
@@ -252,17 +253,17 @@ _ethumb_client_name_owner_changed(void *data, DBusMessage *msg)
252 if (strcmp(name, _ethumb_dbus_bus_name) != 0) 253 if (strcmp(name, _ethumb_dbus_bus_name) != 0)
253 return; 254 return;
254 255
255 DBG("NameOwnerChanged from=[%s] to=[%s]\n", from, to); 256 DBG("NameOwnerChanged from=[%s] to=[%s]", from, to);
256 257
257 if (from[0] != '\0' && to[0] == '\0') 258 if (from[0] != '\0' && to[0] == '\0')
258 { 259 {
259 DBG("exit ethumbd at %s\n", from); 260 DBG("exit ethumbd at %s", from);
260 if (strcmp(client->unique_name, from) != 0) 261 if (strcmp(client->unique_name, from) != 0)
261 WRN("%s was not the known name %s, ignored.\n", 262 WRN("%s was not the known name %s, ignored.",
262 from, client->unique_name); 263 from, client->unique_name);
263 else 264 else
264 { 265 {
265 ERR("server exit!!!\n"); 266 ERR("server exit!!!");
266 if (client->die.cb) 267 if (client->die.cb)
267 { 268 {
268 client->die.cb(client->die.data, client); 269 client->die.cb(client->die.data, client);
@@ -277,7 +278,7 @@ _ethumb_client_name_owner_changed(void *data, DBusMessage *msg)
277 } 278 }
278 } 279 }
279 else 280 else
280 DBG("unknown change from %s to %s\n", from, to); 281 DBG("unknown change from %s to %s", from, to);
281} 282}
282 283
283static void 284static void
@@ -366,18 +367,18 @@ _ethumb_client_start_server_cb(void *data, DBusMessage *msg, DBusError *err)
366 dbus_message_iter_get_basic(&iter, &ret); 367 dbus_message_iter_get_basic(&iter, &ret);
367 if ((ret != 1) && (ret != 2)) 368 if ((ret != 1) && (ret != 2))
368 { 369 {
369 ERR("Error starting Ethumbd DBus service by its name: retcode %u\n", 370 ERR("Error starting Ethumbd DBus service by its name: retcode %u",
370 ret); 371 ret);
371 goto error; 372 goto error;
372 } 373 }
373 374
374 client->server_started = 1; 375 client->server_started = 1;
375 DBG("Ethumbd DBus service started successfully (%d), now request its name\n", 376 DBG("Ethumbd DBus service started successfully (%d), now request its name",
376 ret); 377 ret);
377 378
378 if (client->pending_get_name_owner) 379 if (client->pending_get_name_owner)
379 { 380 {
380 DBG("already requesting name owner, cancel and try again\n"); 381 DBG("already requesting name owner, cancel and try again");
381 dbus_pending_call_cancel(client->pending_get_name_owner); 382 dbus_pending_call_cancel(client->pending_get_name_owner);
382 } 383 }
383 384
@@ -386,14 +387,14 @@ _ethumb_client_start_server_cb(void *data, DBusMessage *msg, DBusError *err)
386 client); 387 client);
387 if (!client->pending_get_name_owner) 388 if (!client->pending_get_name_owner)
388 { 389 {
389 ERR("could not create a get_name_owner request.\n"); 390 ERR("could not create a get_name_owner request.");
390 goto error; 391 goto error;
391 } 392 }
392 393
393 return; 394 return;
394 395
395 error: 396 error:
396 ERR("failed to start Ethumbd DBus service by its name.\n"); 397 ERR("failed to start Ethumbd DBus service by its name.");
397 _ethumb_client_report_connect(client, 0); 398 _ethumb_client_report_connect(client, 0);
398} 399}
399 400
@@ -402,7 +403,7 @@ _ethumb_client_start_server(Ethumb_Client *client)
402{ 403{
403 if (client->pending_start_service_by_name) 404 if (client->pending_start_service_by_name)
404 { 405 {
405 DBG("already pending start service by name.\n"); 406 DBG("already pending start service by name.");
406 return; 407 return;
407 } 408 }
408 409
@@ -412,7 +413,7 @@ _ethumb_client_start_server(Ethumb_Client *client)
412 client); 413 client);
413 if (!client->pending_start_service_by_name) 414 if (!client->pending_start_service_by_name)
414 { 415 {
415 ERR("could not start service by name!\n"); 416 ERR("could not start service by name!");
416 _ethumb_client_report_connect(client, 0); 417 _ethumb_client_report_connect(client, 0);
417 } 418 }
418} 419}
@@ -429,7 +430,7 @@ _ethumb_client_get_name_owner(void *data, DBusMessage *msg, DBusError *err)
429 430
430 if (dbus_error_is_set(err) && (!client->server_started)) 431 if (dbus_error_is_set(err) && (!client->server_started))
431 { 432 {
432 DBG("could not find server (%s), try to start it...\n", err->message); 433 DBG("could not find server (%s), try to start it...", err->message);
433 _ethumb_client_start_server(client); 434 _ethumb_client_start_server(client);
434 return; 435 return;
435 } 436 }
@@ -444,11 +445,11 @@ _ethumb_client_get_name_owner(void *data, DBusMessage *msg, DBusError *err)
444 dbus_message_iter_get_basic(&iter, &uid); 445 dbus_message_iter_get_basic(&iter, &uid);
445 if (!uid) 446 if (!uid)
446 { 447 {
447 ERR("no name owner!\n"); 448 ERR("no name owner!");
448 goto error; 449 goto error;
449 } 450 }
450 451
451 DBG("unique name = %s\n", uid); 452 DBG("unique name = %s", uid);
452 client->unique_name = eina_stringshare_add(uid); 453 client->unique_name = eina_stringshare_add(uid);
453 454
454 _ethumb_client_call_new(client); 455 _ethumb_client_call_new(client);
@@ -584,7 +585,7 @@ ethumb_client_connect(Ethumb_Client_Connect_Cb connect_cb, const void *data, Ein
584 eclient = calloc(1, sizeof(*eclient)); 585 eclient = calloc(1, sizeof(*eclient));
585 if (!eclient) 586 if (!eclient)
586 { 587 {
587 ERR("could not allocate Ethumb_Client structure.\n"); 588 ERR("could not allocate Ethumb_Client structure.");
588 goto err; 589 goto err;
589 } 590 }
590 591
@@ -595,14 +596,14 @@ ethumb_client_connect(Ethumb_Client_Connect_Cb connect_cb, const void *data, Ein
595 eclient->ethumb = ethumb_new(); 596 eclient->ethumb = ethumb_new();
596 if (!eclient->ethumb) 597 if (!eclient->ethumb)
597 { 598 {
598 ERR("could not create ethumb handler.\n"); 599 ERR("could not create ethumb handler.");
599 goto ethumb_new_err; 600 goto ethumb_new_err;
600 } 601 }
601 602
602 eclient->conn = e_dbus_bus_get(DBUS_BUS_SESSION); 603 eclient->conn = e_dbus_bus_get(DBUS_BUS_SESSION);
603 if (!eclient->conn) 604 if (!eclient->conn)
604 { 605 {
605 ERR("could not connect to session bus.\n"); 606 ERR("could not connect to session bus.");
606 goto connection_err; 607 goto connection_err;
607 } 608 }
608 609
@@ -615,7 +616,7 @@ ethumb_client_connect(Ethumb_Client_Connect_Cb connect_cb, const void *data, Ein
615 eclient); 616 eclient);
616 if (!eclient->pending_get_name_owner) 617 if (!eclient->pending_get_name_owner)
617 { 618 {
618 ERR("could not create a get_name_owner request.\n"); 619 ERR("could not create a get_name_owner request.");
619 goto connection_err; 620 goto connection_err;
620 } 621 }
621 622
@@ -793,7 +794,7 @@ _ethumb_client_dbus_get_bytearray(DBusMessageIter *iter)
793 el_type = dbus_message_iter_get_element_type(iter); 794 el_type = dbus_message_iter_get_element_type(iter);
794 if (el_type != DBUS_TYPE_BYTE) 795 if (el_type != DBUS_TYPE_BYTE)
795 { 796 {
796 ERR("not an byte array element.\n"); 797 ERR("not an byte array element.");
797 return NULL; 798 return NULL;
798 } 799 }
799 800
@@ -2050,7 +2051,7 @@ ethumb_client_generate(Ethumb_Client *client, Ethumb_Client_Generate_Cb generate
2050 ethumb_file_get(client->ethumb, &file, &key); 2051 ethumb_file_get(client->ethumb, &file, &key);
2051 if (!file) 2052 if (!file)
2052 { 2053 {
2053 ERR("no file set.\n"); 2054 ERR("no file set.");
2054 return -1; 2055 return -1;
2055 } 2056 }
2056 2057