[gnome-applets/wip/segeiger/window-picker-in-process: 1/9] windowpicker: Build applet in process and add some debug messages

[Sebastian Geiger <segeiger src gnome org>]

commit 0cfdd8c0b0824112925212e39bb818d9d25f5282
Author: Sebastian Geiger <sbastig gmx net>
Date:   Sun Jun 7 13:16:12 2015 +0200

    windowpicker: Build applet in process and add some debug messages

 windowpicker/data/Makefile.am                      |    4 +++-
 ...g.gnome.applets.WindowPicker.panel-applet.in.in |    3 ++-
 ...ome.panel.applet.WindowPickerFactory.service.in |    2 +-
 windowpicker/src/Makefile.am                       |    7 ++++---
 windowpicker/src/applet.c                          |    2 +-
 windowpicker/src/task-item.c                       |    4 ++--
 6 files changed, 13 insertions(+), 9 deletions(-)
---
diff --git a/windowpicker/data/Makefile.am b/windowpicker/data/Makefile.am
index d9ab23a..a522799 100644
--- a/windowpicker/data/Makefile.am
+++ b/windowpicker/data/Makefile.am
@@ -2,6 +2,8 @@ appletdir       = $(LIBPANEL_APPLET_DIR)
 applet_in_files = org.gnome.applets.WindowPicker.panel-applet.in
 applet_DATA     = $(applet_in_files:.panel-applet.in=.panel-applet)
 
+APPLET_LOCATION=$(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)/libwindow-picker-applet.so
+
 uidir = $(datadir)/$(PACKAGE)/ui
 ui_DATA = \
        menu.xml \
@@ -9,7 +11,7 @@ ui_DATA = \
 
 $(applet_in_files): $(applet_in_files).in Makefile
        $(AM_V_GEN)sed \
-       -e "s|\ LIBEXECDIR\@|$(libexecdir)|" \
+       -e "s|\ APPLET_LOCATION\@|$(APPLET_LOCATION)|" \
        -e "s|\ VERSION\@|$(PACKAGE_VERSION)|" \
        $< > $@
 
diff --git a/windowpicker/data/org.gnome.applets.WindowPicker.panel-applet.in.in 
b/windowpicker/data/org.gnome.applets.WindowPicker.panel-applet.in.in
index 9219bb4..46e4300 100644
--- a/windowpicker/data/org.gnome.applets.WindowPicker.panel-applet.in.in
+++ b/windowpicker/data/org.gnome.applets.WindowPicker.panel-applet.in.in
@@ -1,6 +1,7 @@
 [Applet Factory]
 Id=WindowPickerFactory
-Location= LIBEXECDIR@/window-picker-applet
+Location= APPLET_LOCATION@
+InProcess=true
 _Name=Window Picker
 _Description=Factory for the window picker applet
 
diff --git a/windowpicker/data/org.gnome.panel.applet.WindowPickerFactory.service.in 
b/windowpicker/data/org.gnome.panel.applet.WindowPickerFactory.service.in
index 0bf7f15..0a321b6 100644
--- a/windowpicker/data/org.gnome.panel.applet.WindowPickerFactory.service.in
+++ b/windowpicker/data/org.gnome.panel.applet.WindowPickerFactory.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=org.gnome.panel.applet.WindowPickerFactory
-Exec= LIBEXECDIR@/window-picker-applet
+Exec= LIBDIR@/window-picker-applet
diff --git a/windowpicker/src/Makefile.am b/windowpicker/src/Makefile.am
index 1eee97f..d556f87 100644
--- a/windowpicker/src/Makefile.am
+++ b/windowpicker/src/Makefile.am
@@ -1,4 +1,5 @@
-libexec_PROGRAMS=window-picker-applet
+window_picker_libdir=${pkglibdir}/${LIBPANEL_APPLET_API_VERSION}
+window_picker_lib_LTLIBRARIES=libwindow-picker-applet.la
 
 PKGDATADIR = $(datadir)/window-picker-applet
 AM_CFLAGS=\
@@ -15,11 +16,11 @@ AM_CFLAGS=\
        -DGTK_DISABLE_SINGLE_INCLUDES \
     -lm
 
-window_picker_applet_LDADD = \
+libwindow_picker_applet_la_LIBADD = \
        $(GNOME_APPLETS_LIBS) \
        $(LIBWNCK_LIBS)
 
-window_picker_applet_SOURCES = \
+libwindow_picker_applet_la_SOURCES = \
        applet.c \
        applet.h \
        task-item.c \
diff --git a/windowpicker/src/applet.c b/windowpicker/src/applet.c
index 847cfee..6b4a062 100644
--- a/windowpicker/src/applet.c
+++ b/windowpicker/src/applet.c
@@ -464,7 +464,7 @@ window_picker_applet_get_expand_task_list (WindowPickerApplet *picker) {
     return picker->priv->expand_task_list;
 }
 
-PANEL_APPLET_OUT_PROCESS_FACTORY ("WindowPickerFactory",
+PANEL_APPLET_IN_PROCESS_FACTORY ("WindowPickerFactory",
                                   WINDOW_PICKER_APPLET_TYPE,
                                   window_picker_factory,
                                   NULL);
diff --git a/windowpicker/src/task-item.c b/windowpicker/src/task-item.c
index bd7703c..e8aed97 100644
--- a/windowpicker/src/task-item.c
+++ b/windowpicker/src/task-item.c
@@ -140,12 +140,12 @@ static gboolean on_task_item_button_released (
         if (WNCK_IS_WORKSPACE (workspace)
             && workspace != wnck_screen_get_active_workspace (screen))
         {
-                wnck_workspace_activate (workspace, event->time);
+            wnck_workspace_activate (workspace, gtk_get_current_event_time());
         }
         if (wnck_window_is_active (window)) {
             wnck_window_minimize (window);
         } else {
-            wnck_window_activate (window, event->time);
+            wnck_window_activate_transient(window, gtk_get_current_event_time());
         }
     }
     return TRUE;