Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/exhibit/src/bin
Modified Files:
exhibit_image.c exhibit_main.c
Log Message:
use enlightenment_remote instead of e_lib to set the e17 background.
===================================================================
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_image.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- exhibit_image.c 3 Mar 2006 00:44:37 -0000 1.21
+++ exhibit_image.c 9 Jul 2006 04:48:07 -0000 1.22
@@ -1,6 +1,6 @@
#include "exhibit.h"
#include <Ecore_File.h>
-
+#include <Ecore_Evas.h>
#define R_CMOD(r) \
red_mapping[(int)(r)]
#define G_CMOD(g) \
@@ -650,8 +650,8 @@
if(!pid)
{
#if HAVE_E
- if (!e_lib_init(getenv("DISPLAY")))
- goto PSEUDO;
+ if (!ecore_file_app_installed("enlightenment_remote"))
+ goto PSEUDO;
/* make sure we got a file name */
if (!im->filename) exit(0);
if(strlen(im->filename) <= 4) exit(0);
@@ -666,6 +666,7 @@
int w, h, num;
char static_bg[PATH_MAX];
char esetroot_s[PATH_MAX*2];
+ char e_bg_set[PATH_MAX*2];
char filename_s[PATH_MAX];
Ecore_X_Window *roots = NULL;
@@ -677,10 +678,10 @@
ecore_x_window_size_get(roots[0], &w, &h);
snprintf(filename_s, PATH_MAX, "/tmp/%s.png", filenoext);
snprintf(static_bg, PATH_MAX, "edje_thumb %s desktop/background %s
-g %dx%d -og %dx%d", im->filename, filename_s, w, h, w, h);
+ snprintf(e_bg_set, PATH_MAX, "enlightenment_remote -default-bg-set
%s", im->filename);
+ snprintf(esetroot_s, PATH_MAX, "Esetroot %s %s ", esetroot_opt,
filename_s);
system(static_bg);
- e_lib_background_set(im->filename);
-
- snprintf(esetroot_s, PATH_MAX, "Esetroot %s %s ", esetroot_opt,
filename_s);
+ system(e_bg_set);
system(esetroot_s);
exit(0);
}
@@ -762,10 +763,15 @@
engrave_file_free(edj);
/* set the background */
- e_lib_background_set(edj_file);
+ {
+ char e_bg_set[PATH_MAX*2];
+
+ snprintf(e_bg_set, PATH_MAX, "enlightenment_remote -default-bg-set
%s", edj_file);
+ system(e_bg_set);
+ }
#endif
- e_lib_shutdown();
+
#endif
PSEUDO:
===================================================================
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_main.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -3 -r1.46 -r1.47
--- exhibit_main.c 29 May 2006 12:07:04 -0000 1.46
+++ exhibit_main.c 9 Jul 2006 04:48:07 -0000 1.47
@@ -1,6 +1,6 @@
#include "exhibit.h"
#include <Ecore_File.h>
-
+#include <Ecore_Evas.h>
extern pid_t pid;
extern Evas_List *thumb_list;
@@ -994,7 +994,8 @@
fprintf(stderr, "Could not init etk. Exiting...\n");
return 0;
};
-
+
+ ecore_file_init();
event_handlers = evas_list_append(event_handlers,
ecore_event_handler_add(ECORE_EXE_EVENT_DEL,
_ex_thumb_exe_exit,
@@ -1007,6 +1008,7 @@
_ex_main_window_show(NULL);
etk_main();
+ ecore_file_shutdown();
etk_shutdown();
return 0;
-------------------------------------------------------------------------
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
