Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : screenshot
Dir : e_modules/screenshot
Modified Files:
e_mod_main.c
Log Message:
Prefer single line if's for short statements.
===================================================================
RCS file: /cvs/e/e_modules/screenshot/e_mod_main.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -3 -r1.41 -r1.42
--- e_mod_main.c 1 Jun 2006 21:03:11 -0000 1.41
+++ e_mod_main.c 1 Jun 2006 21:40:52 -0000 1.42
@@ -60,9 +60,7 @@
/* Define the gadcon class */
static const E_Gadcon_Client_Class _gc_class = {
GADCON_CLIENT_CLASS_VERSION,
- "screenshot",
- {
- _gc_init, _gc_shutdown, _gc_orient, _gc_label, _gc_icon}
+ "screenshot", {_gc_init, _gc_shutdown, _gc_orient, _gc_label, _gc_icon}
};
static E_Gadcon_Client *
@@ -78,8 +76,7 @@
inst = E_NEW(Instance, 1);
ci = _ss_config_item_get(id);
- if (!ci->id)
- ci->id = evas_stringshare_add(id);
+ if (!ci->id) ci->id = evas_stringshare_add(id);
ss = _ss_new(gc->evas);
ss->inst = inst;
@@ -103,8 +100,7 @@
Instance *inst;
inst = gcc->data;
- if (inst->filename)
- evas_stringshare_del(inst->filename);
+ if (inst->filename) evas_stringshare_del(inst->filename);
ss_config->instances = evas_list_remove(ss_config->instances, inst);
_ss_free(inst->ss);
free(inst);
@@ -175,8 +171,7 @@
static void
_ss_menu_cb_post(void *data, E_Menu *m)
{
- if (!ss_config->menu)
- return;
+ if (!ss_config->menu) return;
e_object_del(E_OBJECT(ss_config->menu));
ss_config->menu = NULL;
}
@@ -201,10 +196,8 @@
for (l = ss_config->items; l; l = l->next)
{
ci = l->data;
- if (!ci->id)
- continue;
- if (!strcmp(ci->id, id))
- return ci;
+ if (!ci->id) continue;
+ if (!strcmp(ci->id, id)) return ci;
}
ci = E_NEW(Config_Item, 1);
@@ -362,14 +355,10 @@
Config_Item *ci;
ci = ss_config->items->data;
- if (ci->id)
- evas_stringshare_del(ci->id);
- if (ci->location)
- evas_stringshare_del(ci->location);
- if (ci->filename)
- evas_stringshare_del(ci->filename);
- if (ci->app)
- evas_stringshare_del(ci->app);
+ if (ci->id) evas_stringshare_del(ci->id);
+ if (ci->location) evas_stringshare_del(ci->location);
+ if (ci->filename) evas_stringshare_del(ci->filename);
+ if (ci->app) evas_stringshare_del(ci->app);
ss_config->items = evas_list_remove_list(ss_config->items,
ss_config->items);
free(ci);
}
@@ -392,8 +381,7 @@
inst = l->data;
ci = _ss_config_item_get(inst->gcc->id);
- if (ci->id)
- evas_stringshare_del(ci->id);
+ if (ci->id) evas_stringshare_del(ci->id);
ci->id = evas_stringshare_add(inst->gcc->id);
}
e_config_domain_save("module.screenshot", conf_edd, ss_config);
@@ -438,9 +426,7 @@
char *cmd, *opt, *f;
Config_Item *ci;
- if (inst->exe)
- return;
-
+ if (inst->exe) return;
ci = _ss_config_item_get(inst->gcc->id);
if (ci->use_import == 1)
@@ -486,20 +472,13 @@
char buf[1024];
char *opts[8] = { '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0' };
- if (ci->import.use_img_border)
- opts[0] = strdup("-border");
- if (ci->import.use_dither)
- opts[1] = strdup("-dither");
- if (ci->import.use_frame)
- opts[2] = strdup("-frame");
- if (ci->import.use_mono)
- opts[3] = strdup("-mono");
- if (ci->import.use_silent)
- opts[4] = strdup("-silent");
- if (ci->import.use_trim)
- opts[5] = strdup("-trim");
- if (!ci->import.use_window)
- opts[6] = strdup("-window root");
+ if (ci->import.use_img_border) opts[0] = strdup("-border");
+ if (ci->import.use_dither) opts[1] = strdup("-dither");
+ if (ci->import.use_frame) opts[2] = strdup("-frame");
+ if (ci->import.use_mono) opts[3] = strdup("-mono");
+ if (ci->import.use_silent) opts[4] = strdup("-silent");
+ if (ci->import.use_trim) opts[5] = strdup("-trim");
+ if (!ci->import.use_window) opts[6] = strdup("-window root");
if (ci->delay_time > 0)
{
snprintf(buf, sizeof(buf), "-pause %.0f", ci->delay_time);
@@ -516,10 +495,8 @@
char buf[1024];
char *opts[8] = { '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0' };
- if (ci->scrot.use_img_border)
- opts[0] = strdup("--border");
- if (ci->scrot.use_thumb)
- opts[1] = strdup("--thumb 25");
+ if (ci->scrot.use_img_border) opts[0] = strdup("--border");
+ if (ci->scrot.use_thumb) opts[1] = strdup("--thumb 25");
if (ci->delay_time > 0)
{
snprintf(buf, sizeof(buf), "--delay %.0f", ci->delay_time);
@@ -585,22 +562,15 @@
{
x = ecore_file_strip_ext(file);
if (!x)
- {
- if (strstr(file, ci->filename))
- c++;
- }
+ if (strstr(file, ci->filename)) c++;
else
- {
- if (strstr(x, ci->filename))
- c++;
- }
+ if (strstr(x, ci->filename)) c++;
}
- if (fl)
- ecore_list_destroy(fl);
- if (c == 0)
- c = 1;
- else
- c++;
+ if (fl) ecore_list_destroy(fl);
+ if (c == 0)
+ c = 1;
+ else
+ c++;
snprintf(buff, sizeof(buff), "%s/%s%i.png", strdup(ci->location),
strdup(ci->filename), c);
}
}
@@ -617,17 +587,14 @@
char buf[4096];
ev = event;
- if (!ev->exe)
- return 1;
+ if (!ev->exe) return 1;
x = ev->exe;
- if (!x)
- return 1;
+ if (!x) return 1;
inst = ecore_exe_data_get(x);
x = NULL;
inst->exe = NULL;
- if (inst->filename)
- evas_stringshare_del(inst->filename);
+ if (inst->filename) evas_stringshare_del(inst->filename);
if (ss_config->exe_exit_handler)
ecore_event_handler_del(ss_config->exe_exit_handler);
@@ -637,6 +604,5 @@
snprintf(buf, sizeof(buf), "%s %s", ci->app, inst->filename);
x = ecore_exe_run(buf, NULL);
}
-
return 0;
}
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
