r2024 - in trunk/src/target/OM-2007/panel-plugins/openmoko-panel-startup: . src

[stefan at sita.openmoko.org]

Author: stefan
Date: 2007-05-18 22:22:05 +0200 (Fri, 18 May 2007)
New Revision: 2024

Modified:
   trunk/src/target/OM-2007/panel-plugins/openmoko-panel-startup/ChangeLog
   trunk/src/target/OM-2007/panel-plugins/openmoko-panel-startup/src/openmoko-panel-startup.c
Log:
2007-05-18  Stefan Schmidt,,,  <stefan at openmoko.org>

        Reviewed by NOBODY (OOPS!).

        * src/openmoko-panel-startup.c:
        (show_hourglass):
        (hide_hourglass):
        (mb_panel_applet_create):



Modified: trunk/src/target/OM-2007/panel-plugins/openmoko-panel-startup/ChangeLog
===================================================================
--- trunk/src/target/OM-2007/panel-plugins/openmoko-panel-startup/ChangeLog	2007-05-18 17:40:21 UTC (rev 2023)
+++ trunk/src/target/OM-2007/panel-plugins/openmoko-panel-startup/ChangeLog	2007-05-18 20:22:05 UTC (rev 2024)
@@ -1,3 +1,12 @@
+2007-05-18  Stefan Schmidt,,,  <stefan at openmoko.org>
+
+        Reviewed by NOBODY (OOPS!).
+
+        * src/openmoko-panel-startup.c:
+        (show_hourglass):
+        (hide_hourglass):
+        (mb_panel_applet_create):
+
 2007-05-18 Stefan Schmidt <stefan at openmoko.org>
 
         * src/openmoko-panel-startup.c:

Modified: trunk/src/target/OM-2007/panel-plugins/openmoko-panel-startup/src/openmoko-panel-startup.c
===================================================================
--- trunk/src/target/OM-2007/panel-plugins/openmoko-panel-startup/src/openmoko-panel-startup.c	2007-05-18 17:40:21 UTC (rev 2023)
+++ trunk/src/target/OM-2007/panel-plugins/openmoko-panel-startup/src/openmoko-panel-startup.c	2007-05-18 20:22:05 UTC (rev 2024)
@@ -41,14 +41,9 @@
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 
-/* FIXME */
-#define USE_LIBSN
+#define SN_API_NOT_YET_FROZEN 1
+#include <libsn/sn.h>
 
-#ifdef USE_LIBSN
-  #define SN_API_NOT_YET_FROZEN 1
-  #include <libsn/sn.h>
-#endif
-
 #include <string.h>
 
 #define TIMEOUT		   20
@@ -60,7 +55,6 @@
 	const char *last_icon;
 	guint timeout_id;
 	GdkWindow *root_window;
-	GtkWidget* eventbox;
 	SnDisplay *sn_display;
 } StartupApplet;
 
@@ -97,14 +91,14 @@
 static void show_hourglass(StartupApplet *applet)
 {
 	g_message("Entered %s", G_STRFUNC);
-	gtk_widget_show_all(GTK_WIDGET (applet->eventbox));
+	gtk_widget_show_all(GTK_WIDGET (applet->image));
 	hourglass_shown = TRUE;
 }
 
 static void hide_hourglass(StartupApplet *applet)
 {
 	g_message("Entered %s", G_STRFUNC);
-	gtk_widget_hide_all(GTK_WIDGET (applet->eventbox));
+	gtk_widget_hide_all(GTK_WIDGET (applet->image));
 	hourglass_shown = FALSE;
 }
 
@@ -260,8 +254,6 @@
 	/* Create applet data structure */
 	applet = g_slice_new(StartupApplet);
 
-	//applet->last_icon = NULL;
-
 	/* Create image */
     applet->image = GTK_IMAGE(gtk_image_new());
 
@@ -293,18 +285,11 @@
 	 */
 	XSelectInput (xdisplay, DefaultRootWindow(xdisplay), PropertyChangeMask);
 
-	/* Get root window */
-	//applet->root_window = gdk_screen_get_root_window
-	//					(gtk_widget_get_screen( GTK_WIDGET (applet->image)));
-
 	applet->root_window = gdk_window_lookup_for_display(gdk_x11_lookup_xdisplay(xdisplay), 0);
 
 	gdk_window_add_filter (applet->root_window, (GdkFilterFunc) filter_func, applet);
 
 	/* Show! */
-	applet->eventbox = gtk_event_box_new();
-	gtk_container_add(GTK_CONTAINER(applet->eventbox), GTK_WIDGET(applet->image));
-	gtk_event_box_set_visible_window(applet->eventbox, FALSE);
 	moko_panel_applet_set_widget( MOKO_PANEL_APPLET(mokoapplet), GTK_WIDGET(applet->image) );
 	gtk_widget_show_all(GTK_WIDGET(mokoapplet));