Enlightenment CVS committal
Author : atmosphere
Project : misc
Module : engage
Dir : misc/engage/src
Modified Files:
config.c wm.c
Log Message:
ran indent over config.c and found a segv, freeing a pointer w/o checking if it's
valid. Since it's not even used, feed the call NULL so it doesn't bother filling it
out
===================================================================
RCS file: /cvsroot/enlightenment/misc/engage/src/config.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- config.c 5 May 2004 15:53:48 -0000 1.12
+++ config.c 6 May 2004 18:06:25 -0000 1.13
@@ -9,52 +9,57 @@
int
od_config_init(int argc, char **argv)
{
- int ret;
-
+ int ret;
+
ecore_config_create_int("engage.options.width", 1024, 'W', "width",
- "The overall width of the application area");
+ "The overall width of the application area");
ecore_config_create_int("engage.options.height", 100, 'H', "height",
- "The overall height of the application area");
- ecore_config_create_theme("engage.options.theme", "gentoo", 't', "theme",
- "The theme name to use (minus path and extension)");
+ "The overall height of the application area");
+ ecore_config_create_theme("engage.options.theme", "gentoo", 't', "theme",
+ "The theme name to use (minus path and extension)");
/* not technically correct - iconsets should do this, but it looks better for
- everything bar 'gentoo' - and we all have the others installed ;) */
+ * everything bar 'gentoo' - and we all have the others installed ;) */
ecore_config_set_theme_preview_group("engage.options.theme", "Terminal");
- ecore_config_create_string("engage.options.engine", "software", 'e',"engine",
- "The X11 engine to use - either software or gl");
+ ecore_config_create_string("engage.options.engine", "software", 'e', "engine",
+ "The X11 engine to use - either software or gl");
options.icon_path = PACKAGE_DATA_DIR "/icons/";
ecore_config_create_int_bound("engage.options.mode", OM_BELOW, 0, 1, 1, 'm',
- "mode", "The display mode, 0 = ontop + shaped, 1 = below + transp");
- ecore_config_create_int_bound("engage.options.grab_min_icons", 1, 0, 1, 1,'g',
- "grab-min", "Capture the icons of minimised applications");
- ecore_config_create_int_bound("engage.options.grab_app_icons", 1, 0, 1, 1,'G',
- "grab-app", "Capture the icons of all running applications");
+ "mode",
+ "The display mode, 0 = ontop + shaped, 1 = below +
transp");
+ ecore_config_create_int_bound("engage.options.grab_min_icons", 1, 0, 1, 1,
+ 'g', "grab-min",
+ "Capture the icons of minimised applications");
+ ecore_config_create_int_bound("engage.options.grab_app_icons", 1, 0, 1, 1,
+ 'G', "grab-app",
+ "Capture the icons of all running applications");
- ecore_config_create_int("engage.options.size", 32, 's', "size",
- "Size of icons in default state");
+ ecore_config_create_int("engage.options.size", 32, 's', "size",
+ "Size of icons in default state");
ecore_config_create_int("engage.options.spacing", 4, 'S', "spacing",
- "Space in pixels between each icon");
+ "Space in pixels between each icon");
ecore_config_create_float("engage.options.zoom_factor", 2.0, 'z', "zoom",
- "Zoom factor of the icons - 1.0 == 100% == nozoom");
+ "Zoom factor of the icons - 1.0 == 100% == nozoom");
ecore_config_create_int("engage.options.arrow_size", 6, 'a', "arrow-size",
- "Size (in pixels) of the status arrows");
+ "Size (in pixels) of the status arrows");
ecore_config_create_float("engage.options.zoom_duration", 0.1, 'd',
- "zoom-time", "Time taken (in seconds) for icons to zoom");
+ "zoom-time",
+ "Time taken (in seconds) for icons to zoom");
options.tt_txt_color = 0x00000000;
options.tt_shd_color = 0x7f000000;
options.bg_fore = 0x7f000000;
options.bg_back = 0x7fffffff;
ecore_config_create_string("engage.options.tt_fa", "Vera", 'f', "font",
- "The font to use for application titles etc.");
+ "The font to use for application titles etc.");
ecore_config_create_int("engage.options.tt_fs", 8, 'F', "font-size",
- "The font size (in points)");
+ "The font size (in points)");
ecore_config_create_float("engage.options.icon_appear_duration", 0.1, 'D',
- "appear-time", "Time taken (in seconds) for new icons to appear");
+ "appear-time",
+ "Time taken (in seconds) for new icons to appear");
ecore_config_load();
ret = ecore_config_args_parse(argc, argv);
-
+
options.width = ecore_config_get_int("engage.options.width");
options.height = ecore_config_get_int("engage.options.height");
options.engine = ecore_config_get_string("engage.options.engine");
@@ -76,6 +81,6 @@
options.tt_fs = ecore_config_get_int("engage.options.tt_fs");
options.icon_appear_duration =
ecore_config_get_float("engage.options.icon_appear_duration");
-
+
return ret;
}
===================================================================
RCS file: /cvsroot/enlightenment/misc/engage/src/wm.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- wm.c 6 May 2004 12:47:20 -0000 1.12
+++ wm.c 6 May 2004 18:06:25 -0000 1.13
@@ -6,6 +6,7 @@
#ifdef DMALLOC
#include "dmalloc.h"
#endif
+#include <assert.h>
/**
* A list of all the X Window clients, data is type OD_Window *
@@ -178,10 +179,9 @@
char *
od_wm_get_winclass(Ecore_X_Window win)
{
- char *ret = NULL, *dummy = NULL;
+ char *ret = NULL;
- ecore_x_window_prop_name_class_get(win, &dummy, &ret);
- free(dummy);
+ ecore_x_window_prop_name_class_get(win, NULL, &ret);
if (ret)
return ret;
else
-------------------------------------------------------
This SF.Net email is sponsored by Sleepycat Software
Learn developer strategies Cisco, Motorola, Ericsson & Lucent use to
deliver higher performing products faster, at low TCO.
http://www.sleepycat.com/telcomwpreg.php?From=osdnemail3
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
