1 files changed, 21 insertions, 10 deletions
diff --git a/geyes/src/geyes.c b/geyes/src/geyes.c
index 5fdecf38..a8337447 100644
--- a/geyes/src/geyes.c
+++ b/geyes/src/geyes.c
@@ -135,18 +135,29 @@ timer_cb (EyesApplet *eyes_applet)
 gint x, y, dx, dy;
 gint pupil_x, pupil_y;
 gsize i;
+ int applet_x,applet_y;
 
 display = gtk_widget_get_display (GTK_WIDGET (eyes_applet->applet));
 seat = gdk_display_get_default_seat (display);
 
- for (i = 0; i < eyes_applet->num_eyes; i++) {
- if (gtk_widget_get_realized (eyes_applet->eyes[i])) {
+ for (i = 0; i < eyes_applet->num_eyes; i++)
+ {
+ if (gtk_widget_get_realized (eyes_applet->eyes[i]))
+ {
 gdk_window_get_device_position (gtk_widget_get_window (eyes_applet->eyes[i]),
 gdk_seat_get_pointer (seat),
 &x, &y, NULL);
+
+#ifdef ENABLE_IN_PROCESS
+ gdk_window_get_origin (gtk_widget_get_window (GTK_WIDGET(eyes_applet->applet)),
+ &applet_x, &applet_y);
+#else
+ applet_x = 0;
+ applet_y = 0;
+#endif
 gtk_widget_translate_coordinates (eyes_applet->eyes[i],
 gtk_widget_get_toplevel(eyes_applet->eyes[i]),
- 0, 0, &dx, &dy);
+ -applet_x, -applet_y, &dx, &dy);
 x -= dx;
 y -= dy;
 
@@ -258,8 +269,6 @@ setup_eyes (EyesApplet *eyes_applet)
 gtk_widget_set_valign (eyes_applet->eyes[i], GTK_ALIGN_CENTER);
 }
 
- gtk_widget_realize (eyes_applet->eyes[i]);
-
 eyes_applet->pointer_last_x[i] = G_MAXINT;
 eyes_applet->pointer_last_y[i] = G_MAXINT;
 
@@ -398,7 +407,9 @@ geyes_applet_fill (MatePanelApplet *applet)
 GtkActionGroup *action_group;
 gboolean result;
 
+#ifndef ENABLE_IN_PROCESS
 g_set_application_name (_("Eyes"));
+#endif
 gtk_window_set_default_icon_name ("mate-eyes-applet");
 mate_panel_applet_set_flags (applet, MATE_PANEL_APPLET_EXPAND_MINOR);
 
@@ -466,8 +477,8 @@ geyes_applet_factory (MatePanelApplet *applet,
 return retval;
 }
 
-MATE_PANEL_APPLET_OUT_PROCESS_FACTORY ("GeyesAppletFactory",
- PANEL_TYPE_APPLET,
- "geyes",
- geyes_applet_factory,
- NULL)
+PANEL_APPLET_FACTORY ("GeyesAppletFactory",
+ PANEL_TYPE_APPLET,
+ "geyes",
+ geyes_applet_factory,
+ NULL)