Changeset 1984

Timestamp:

05/16/07 23:02:03 (6 years ago)

Author:

stefan

Message:

Use libmokoui
Adjust PATH for images

File:

• trunk/src/target/OM-2007/panel-plugins/openmoko-panel-startup/src/openmoko-panel-startup.c (modified) (4 diffs)

trunk/src/target/OM-2007/panel-plugins/openmoko-panel-startup/src/openmoko-panel-startup.c

@@ -29 +29 @@
  */
 
+#include <libmokoui/moko-panel-applet.h>
+
 #include <stdio.h>
 #include <stdlib.h>
@@ -250 +252 @@
                                                   GtkOrientation orientation)
 {
+    MokoPanelApplet* mokoapplet = MOKO_PANEL_APPLET(moko_panel_applet_new());
+
         StartupApplet *applet;
         Display *xdisplay;
@@ -267 +271 @@
         /* preload pixbufs */
         guint i = 0;
-        applet->hglass[i++] = gdk_pixbuf_new_from_file(DATADIR "/hourglass-0.png", NULL);
-        applet->hglass[i++] = gdk_pixbuf_new_from_file(DATADIR "/hourglass-1.png", NULL);
-        applet->hglass[i++] = gdk_pixbuf_new_from_file(DATADIR "/hourglass-2.png", NULL);
-        applet->hglass[i++] = gdk_pixbuf_new_from_file(DATADIR "/hourglass-3.png", NULL);
-        applet->hglass[i++] = gdk_pixbuf_new_from_file(DATADIR "/hourglass-4.png", NULL);
-        applet->hglass[i++] = gdk_pixbuf_new_from_file(DATADIR "/hourglass-5.png", NULL);
-        applet->hglass[i++] = gdk_pixbuf_new_from_file(DATADIR "/hourglass-6.png", NULL);
-        applet->hglass[i] = gdk_pixbuf_new_from_file(DATADIR "/hourglass-7.png", NULL);
+        applet->hglass[i++] = gdk_pixbuf_new_from_file(PKGDATADIR "/hourglass-0.png", NULL);
+        applet->hglass[i++] = gdk_pixbuf_new_from_file(PKGDATADIR "/hourglass-1.png", NULL);
+        applet->hglass[i++] = gdk_pixbuf_new_from_file(PKGDATADIR "/hourglass-2.png", NULL);
+        applet->hglass[i++] = gdk_pixbuf_new_from_file(PKGDATADIR "/hourglass-3.png", NULL);
+        applet->hglass[i++] = gdk_pixbuf_new_from_file(PKGDATADIR "/hourglass-4.png", NULL);
+        applet->hglass[i++] = gdk_pixbuf_new_from_file(PKGDATADIR "/hourglass-5.png", NULL);
+        applet->hglass[i++] = gdk_pixbuf_new_from_file(PKGDATADIR "/hourglass-6.png", NULL);
+        applet->hglass[i] = gdk_pixbuf_new_from_file(PKGDATADIR "/hourglass-7.png", NULL);
 
         xdisplay = GDK_DISPLAY_XDISPLAY
@@ -301 +305 @@
         applet->eventbox = gtk_event_box_new();
         gtk_container_add(GTK_CONTAINER(applet->eventbox), GTK_WIDGET(applet->image));
-        gtk_widget_show_all(GTK_WIDGET(applet->eventbox));
-
-        return GTK_WIDGET(applet->eventbox);
-}
+        moko_panel_applet_set_widget( MOKO_PANEL_APPLET(mokoapplet), GTK_WIDGET(applet->image) );
+        gtk_widget_show_all(GTK_WIDGET(mokoapplet));
+
+        return GTK_WIDGET(mokoapplet);
+}