Remove the pkg-config file for E_Illume.

Remove dead lines in indicator code.



SVN revision: 45108
devs/princeamd/enlightenment-0.17-elive
Christopher Michael 13 years ago
parent 7c1087a702
commit 245804f5d7
  1. 1
      configure.ac
  2. 5
      src/modules/illume-indicator/e_mod_win.c
  3. 12
      src/modules/illume2/E_Illume.pc.in
  4. 11
      src/modules/illume2/Makefile.am
  5. 10
      x-ui.sh

@ -639,7 +639,6 @@ src/modules/illume-mode-toggle/Makefile
src/modules/illume-mode-toggle/module.desktop
src/modules/illume2/Makefile
src/modules/illume2/module.desktop
src/modules/illume2/E_Illume.pc
src/modules/illume2/keyboards/Makefile
src/modules/illume2/policies/Makefile
src/modules/illume2/policies/illume/Makefile

@ -212,7 +212,8 @@ _e_mod_win_cb_menu_contents(void *data, E_Menu *mn, E_Menu_Item *mi)
e_int_gadcon_config_shelf(iwin->gadcon);
}
static void _e_mod_win_cb_menu_post(void *data, E_Menu *mn)
static void
_e_mod_win_cb_menu_post(void *data, E_Menu *mn)
{
Il_Ind_Win *iwin;
@ -269,7 +270,6 @@ _e_mod_win_cb_mouse_up(void *data, Evas *evas, Evas_Object *obj, void *event)
bd = iwin->win->border;
if (bd->client.illume.drag.locked) return;
if (!ecore_x_e_illume_drag_get(bd->zone->black_win)) return;
// if (!bd->client.illume.drag.drag) return;
ecore_x_e_illume_drag_end_send(bd->client.win);
my = 0;
}
@ -288,7 +288,6 @@ _e_mod_win_cb_mouse_move(void *data, Evas *evas, Evas_Object *obj, void *event)
bd = iwin->win->border;
if (bd->client.illume.drag.locked) return;
if (!ecore_x_e_illume_drag_get(bd->zone->black_win)) return;
// if (!bd->client.illume.drag.drag) return;
if ((bd->y + bd->h + ev->cur.output.y) >= (bd->zone->h)) return;
ecore_x_pointer_last_xy_get(NULL, &py);

@ -1,12 +0,0 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@/@PACKAGE@
Name: e17-illume2
Description: Illume2 Module for E17
Requires: enlightenment
Version: @VERSION@
Libs: -L${libdir}
Libs.private:
Cflags: -I${includedir}

@ -20,9 +20,7 @@ INCLUDES = -I. \
pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
pkg_LTLIBRARIES = module.la
EILLUMEHEADERS = E_Illume.h
module_la_SOURCES = $(EILLUMEHEADERS) \
module_la_SOURCES = E_Illume.h \
e_mod_main.h \
e_mod_main.c \
e_mod_config.h \
@ -49,13 +47,6 @@ module_la_LIBADD = @e_libs@ @dlopen_libs@
module_la_LDFLAGS = -module -avoid-version
module_la_DEPENDENCIES = $(top_builddir)/config.h
installed_headersdir = $(prefix)/include/@PACKAGE@
installed_headers_DATA = $(EILLUMEHEADERS)
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = E_Illume.pc
uninstall:
rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE)
rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE)/policies

@ -12,7 +12,9 @@
#Xephyr :1 -noreset -ac -br -dpi 284 -screen 480x640x16 &
#Xephyr :1 -noreset -ac -br -dpi 284 -screen 640x480x16 -host-cursor &
Xephyr :1 -noreset -ac -br -dpi 284 -screen 480x800 -host-cursor &
Xephyr :1 -noreset -ac -br -dpi 183 -screen 960x400x16 -host-cursor &
#Xephyr :1 -noreset -ac -br -dpi 284 -screen 480x800 -host-cursor &
#Xephyr :1 -noreset -ac -br -dpi 284 -screen 480x640 &
#Xephyr :1 -noreset -ac -br -dpi 284 -screen 640x480 &
#Xephyr :1 -noreset -ac -br -dpi 181 -screen 320x320 &
@ -25,6 +27,6 @@ unset E_RESTART E_START E_IPC_SOCKET E_START_TIME E_CONF_PROFILE
enlightenment_start \
-no-precache \
-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it \
-profile illume-home
#-fake-xinerama-screen 480x320+0+0 \
#-fake-xinerama-screen 480x320+480+0
-profile illume-home \
-fake-xinerama-screen 480x400+0+0 \
-fake-xinerama-screen 480x400+480+0

Loading…
Cancel
Save