--- netbook-launcher-efl-0.2.6.orig/debian/compat +++ netbook-launcher-efl-0.2.6/debian/compat @@ -0,0 +1 @@ +7 --- netbook-launcher-efl-0.2.6.orig/debian/une-efl.desktop +++ netbook-launcher-efl-0.2.6/debian/une-efl.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=Ubuntu Netbook Edition 2D +Comment=This session logs you into a 2D Ubuntu Netbook Edition +Exec=gnome-session +TryExec=gnome-session +Icon= +Type=Application +X-Ubuntu-Gettext-Domain=une-session + --- netbook-launcher-efl-0.2.6.orig/debian/watch +++ netbook-launcher-efl-0.2.6/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://launchpad.net/launch-lite-proj/+download .*/netbook-launcher-efl-(.+)\.tar\.gz --- netbook-launcher-efl-0.2.6.orig/debian/copyright +++ netbook-launcher-efl-0.2.6/debian/copyright @@ -0,0 +1,22 @@ +Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=59 +Name: Netbook Launcher EFL +Maintainer: OEM Services Engineering Team +Source: https://launchpad.net/launch-lite-proj/+download + +Files: * +Copyright: 2009 Canonical Ltd. +License: GPL-3 + This program is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License version 3, as published + by the Free Software Foundation. + + This program is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranties of + MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR + PURPOSE. See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program. If not, see . + + On Debian GNU/Linux systems, the complete text of the GNU General + Public License can be found in the /usr/share/common-licenses/GPL-3 file. --- netbook-launcher-efl-0.2.6.orig/debian/netbook-launcher-efl.install +++ netbook-launcher-efl-0.2.6/debian/netbook-launcher-efl.install @@ -0,0 +1 @@ +debian/une-efl.desktop /usr/share/xsessions/ --- netbook-launcher-efl-0.2.6.orig/debian/rules +++ netbook-launcher-efl-0.2.6/debian/rules @@ -0,0 +1,3 @@ +#!/usr/bin/make -f +%: + dh $@ --- netbook-launcher-efl-0.2.6.orig/debian/control +++ netbook-launcher-efl-0.2.6/debian/control @@ -0,0 +1,32 @@ +Source: netbook-launcher-efl +Section: gnome +Priority: optional +Maintainer: Ubuntu Developers +Build-Depends: debhelper (>= 7.0.50), pkg-config, libtool, intltool, + libeina-dev (>= 0.9.9.063), + libecore-dev (>= 0.9.9.063-2), + libevas-dev (>= 0.9.9.063), + libeet-dev, + libedje-dev (>= 0.9.9.063), + libelementary-dev (>= 0.6.0.063), + libglib2.0-dev, + libgconf2-dev, + libgtk2.0-dev, + libdbus-glib-1-dev, + libgnomeui-dev, + liblauncher-0.1-dev, + libnotify-dev (>= 0.3.2), + libcanberra-dev, + libunique-dev +Standards-Version: 3.8.3 +Homepage: https://launchpad.net/launch-lite-proj + +Package: netbook-launcher-efl +Architecture: any +Depends: ${misc:Depends}, ${shlibs:Depends}, libevas-svn-05-engines-x +Recommends: gnome-menus, webfav, netbook-launcher +Suggests: gnome-web-photo +Description: A lite version of netbook launcher written in EFL + This is a version of netbook-launcher using the Enlightenment Foundation + Libraries (EFL) to run fast on systems with reduced hardware functionality. + It provides a modern application launcher especially suited to small screens. --- netbook-launcher-efl-0.2.6.orig/debian/changelog +++ netbook-launcher-efl-0.2.6/debian/changelog @@ -0,0 +1,65 @@ +netbook-launcher-efl (0.2.6-0ubuntu2~asac1) lucid; urgency=low + + [ Michael Terry ] + * src/launcher/win.c: + - Backported patch from trunk to fix focus for newly launched apps. + LP: #528887 + + [ Alexander Sack ] + * src/launcher/places_storage.c: + - fix LP: #558648 - netbook-launcher-efl occasionally displays cryptic + error messages; we display proper error message rather than error uuid + + -- Alexander Sack Mon, 26 Apr 2010 11:39:05 +0200 + +netbook-launcher-efl (0.2.6-0ubuntu1) lucid; urgency=low + + * New upstream release. + - Logout icon removed. (LP: #525839) + - The launcher now uses libunique. (LP: #525854) + - Increased vertial distance between icons. (LP: #516863) + - No longer use HAL to keep track of removable media. (LP: #522848) + - Now shows focus when using keyboard navigation. (LP: #520502) + + -- Steve Kowalik Fri, 26 Feb 2010 13:24:34 +1100 + +netbook-launcher-efl (0.2.2-0ubuntu3) lucid; urgency=low + + * make netbook-launcher-efl installable side by side to netbook-launcher + (thx to Didier aka didrocks for helping on this) + + drop Conflicts/Replaces: netbook-launcher from debian/control + + add patch to install autostart .desktop in /etc/xdg/xdg-une-efl/ + + add a session une-efl.desktop to /usr/share/xsesssions/ + * recomment netbook-launcher as that ensures that netbook-launcher-efl + gets started + * build depend on liblauncher-0.1-dev + + -- Alexander Sack Wed, 17 Feb 2010 19:33:15 +0100 + +netbook-launcher-efl (0.2.2-0ubuntu2) lucid; urgency=low + + * demote gnome-web-photo to Suggests (see MIR lp:512343) + + -- Alexander Sack Wed, 27 Jan 2010 18:36:45 +0100 + +netbook-launcher-efl (0.2.2-0ubuntu1) lucid; urgency=low + + [ Michael Terry ] + * New upstream release + + [ Luis Felipe Strano Moraes ] + * debian/control: Add missing libevas-svn-05-engines-x dependency + + -- Michael Terry Thu, 14 Jan 2010 15:35:46 -0500 + +netbook-launcher-efl (0.2.0.0-0ubuntu1) lucid; urgency=low + + [ Michael Terry ] + * New upstream release + * Ported to dh7 + * Used DEP-5 for copyright + + [ Jamie Bennett ] + * Initial release (LP: #490860) + + -- Michael Terry Tue, 22 Dec 2009 19:26:32 -0500 --- netbook-launcher-efl-0.2.6.orig/data/desktop/Makefile.am +++ netbook-launcher-efl-0.2.6/data/desktop/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -desktopdir=$(sysconfdir)/xdg/autostart +desktopdir=$(sysconfdir)/xdg/xdg-une-efl/autostart desktop_DATA=netbook-launcher-efl.desktop EXTRA_DIST=netbook-launcher-efl.desktop --- netbook-launcher-efl-0.2.6.orig/data/desktop/Makefile.in +++ netbook-launcher-efl-0.2.6/data/desktop/Makefile.in @@ -229,7 +229,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ MAINTAINERCLEANFILES = Makefile.in -desktopdir = $(sysconfdir)/xdg/autostart +desktopdir = $(sysconfdir)/xdg/xdg-une-efl/autostart desktop_DATA = netbook-launcher-efl.desktop EXTRA_DIST = netbook-launcher-efl.desktop all: all-am --- netbook-launcher-efl-0.2.6.orig/src/launcher/places_storage.c +++ netbook-launcher-efl-0.2.6/src/launcher/places_storage.c @@ -209,7 +209,7 @@ uid = strings[0]; message = strings[1]; _places_storage_ecore_item_done(ctxt, uid); - error_show(uid); + error_show(message); } static Eina_Bool --- netbook-launcher-efl-0.2.6.orig/src/launcher/win.c +++ netbook-launcher-efl-0.2.6/src/launcher/win.c @@ -24,6 +24,7 @@ #include #include +#include #include #include #include @@ -837,6 +838,99 @@ fprintf(stderr, "EDJE-SIGNAL-DEBUG: '%s'\n", source); } +static void +_time_set(Evas_Object *win, unsigned int timestamp) +{ + Ecore_X_Window xwin; + GdkWindow *gdkwin, *topwin; + xwin = elm_win_xwindow_get(win); + if (!xwin) + return; + gdkwin = gdk_window_foreign_new(xwin); + if (!gdkwin) + return; + topwin = gdkwin; + while (gdk_window_get_parent(topwin)) + { + topwin = gdk_window_get_parent(topwin); + topwin = gdk_window_get_toplevel(topwin); + } + gdk_x11_window_set_user_time(topwin, timestamp); + g_object_unref(gdkwin); +} + +static int +_time_kdown(void *data, int type, void *ev) +{ + Evas_Event_Key_Down *event = (Evas_Event_Key_Down *)ev; + struct win_context *ctxt = (struct win_context *)data; + _time_set(ctxt->win, event->timestamp); + return ECORE_CALLBACK_RENEW; +} + +static int +_time_kup(void *data, int type, void *ev) +{ + Evas_Event_Key_Up *event = (Evas_Event_Key_Up *)ev; + struct win_context *ctxt = (struct win_context *)data; + _time_set(ctxt->win, event->timestamp); + return ECORE_CALLBACK_RENEW; +} + +static int +_time_mdown(void *data, int type, void *ev) +{ + Evas_Event_Mouse_Down *event = (Evas_Event_Mouse_Down *)ev; + struct win_context *ctxt = (struct win_context *)data; + _time_set(ctxt->win, event->timestamp); + return ECORE_CALLBACK_RENEW; +} + +static int +_time_mup(void *data, int type, void *ev) +{ + Evas_Event_Mouse_Up *event = (Evas_Event_Mouse_Up *)ev; + struct win_context *ctxt = (struct win_context *)data; + _time_set(ctxt->win, event->timestamp); + return ECORE_CALLBACK_RENEW; +} + +static int +_time_mmove(void *data, int type, void *ev) +{ + Evas_Event_Mouse_Move *event = (Evas_Event_Mouse_Move *)ev; + struct win_context *ctxt = (struct win_context *)data; + _time_set(ctxt->win, event->timestamp); + return ECORE_CALLBACK_RENEW; +} + +static int +_time_min(void *data, int type, void *ev) +{ + Evas_Event_Mouse_In *event = (Evas_Event_Mouse_In *)ev; + struct win_context *ctxt = (struct win_context *)data; + _time_set(ctxt->win, event->timestamp); + return ECORE_CALLBACK_RENEW; +} + +static int +_time_mout(void *data, int type, void *ev) +{ + Evas_Event_Mouse_Out *event = (Evas_Event_Mouse_Out *)ev; + struct win_context *ctxt = (struct win_context *)data; + _time_set(ctxt->win, event->timestamp); + return ECORE_CALLBACK_RENEW; +} + +static int +_time_mwheel(void *data, int type, void *ev) +{ + Evas_Event_Mouse_Wheel *event = (Evas_Event_Mouse_Wheel *)ev; + struct win_context *ctxt = (struct win_context *)data; + _time_set(ctxt->win, event->timestamp); + return ECORE_CALLBACK_RENEW; +} + Evas_Object * win_add(void) { @@ -926,6 +1020,17 @@ evas_object_event_callback_add (layout, EVAS_CALLBACK_KEY_DOWN, _win_key_down, ctxt); + /* Tell the window manager the timestamp of any user events. + This fixes focus issues when launching apps. */ + ecore_event_handler_add(ECORE_EVENT_KEY_DOWN, _time_kdown, ctxt); + ecore_event_handler_add(ECORE_EVENT_KEY_UP, _time_kup, ctxt); + ecore_event_handler_add(ECORE_EVENT_MOUSE_BUTTON_DOWN, _time_mdown, ctxt); + ecore_event_handler_add(ECORE_EVENT_MOUSE_BUTTON_UP, _time_mup, ctxt); + ecore_event_handler_add(ECORE_EVENT_MOUSE_MOVE, _time_mmove, ctxt); + ecore_event_handler_add(ECORE_EVENT_MOUSE_IN, _time_min, ctxt); + ecore_event_handler_add(ECORE_EVENT_MOUSE_OUT, _time_mout, ctxt); + ecore_event_handler_add(ECORE_EVENT_MOUSE_WHEEL, _time_mwheel, ctxt); + key = edje_object_data_get(edje, "contents_anim"); if (key && atoi(key)) ctxt->contents_anim = 1;