Enlightenment CVS committal
Author : onefang
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_desktop
Modified Files:
ecore_desktop_menu.c
Log Message:
Fix rasters seggie.
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_desktop/ecore_desktop_menu.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- ecore_desktop_menu.c 20 Aug 2006 03:45:53 -0000 1.9
+++ ecore_desktop_menu.c 30 Aug 2006 14:49:38 -0000 1.10
@@ -1470,30 +1470,33 @@
/* FIXME: pass an actualy language parameter. */
desktop = ecore_desktop_get(app, NULL);
- if ((generate_data->unallocated) && (desktop->allocated))
- return;
+ if (desktop)
+ {
+ if ((generate_data->unallocated) && (desktop->allocated))
+ return;
- if (_ecore_desktop_menu_apply_rules
- (generate_data, generate_data->rule, key, desktop))
- {
- desktop->allocated = TRUE;
- if (generate_data->include)
- {
- ecore_hash_set(generate_data->apps, key, strdup(app));
+ if (_ecore_desktop_menu_apply_rules
+ (generate_data, generate_data->rule, key, desktop))
+ {
+ desktop->allocated = TRUE;
+ if (generate_data->include)
+ {
+ ecore_hash_set(generate_data->apps, key, strdup(app));
#ifdef DEBUG
- printf("INCLUDING %s%s - %s\n",
- ((generate_data->unallocated) ? "UNALLOCATED " : ""), key,
app);
+ printf("INCLUDING %s%s - %s\n",
+ ((generate_data->unallocated) ? "UNALLOCATED " : ""),
key, app);
#endif
- }
- else
- {
- ecore_hash_remove(generate_data->apps, key);
+ }
+ else
+ {
+ ecore_hash_remove(generate_data->apps, key);
#ifdef DEBUG
- printf("EXCLUDING %s%s - %s\n",
- ((generate_data->unallocated) ? "UNALLOCATED " : ""), key,
app);
+ printf("EXCLUDING %s%s - %s\n",
+ ((generate_data->unallocated) ? "UNALLOCATED " : ""),
key, app);
#endif
- }
- }
+ }
+ }
+ }
}
static int
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
