r2893 - in trunk/src/target/OM-2007.2/panel-plugins: openmoko-panel-gps openmoko-panel-gps/src openmoko-panel-usb openmoko-panel-usb/src

mickey at sita.openmoko.org mickey at sita.openmoko.org
Sun Sep 2 20:15:07 CEST 2007


Author: mickey
Date: 2007-09-02 20:15:06 +0200 (Sun, 02 Sep 2007)
New Revision: 2893

Modified:
   trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-gps/ChangeLog
   trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-gps/src/openmoko-panel-gps.c
   trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-usb/ChangeLog
   trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-usb/src/openmoko-panel-usb.c
Log:
openmoko-panel-usb: catch up with libmokopanelui2 changes
openmoko-panel-gps: catch up with libmokopanelui2 changes


Modified: trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-gps/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-gps/ChangeLog	2007-09-02 18:03:39 UTC (rev 2892)
+++ trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-gps/ChangeLog	2007-09-02 18:15:06 UTC (rev 2893)
@@ -1,5 +1,10 @@
+2007-09-02	Michael Lauer <mickey at openmoko.org>
+
+	* src/openmoko-panel-gps:
+	Use moko_panel_applet_set_icon to set the icon.
+
 2007-07-30  Michael Lauer <mickey at openmoko.org>
 
-        * configure.ac:
-        Import panel-plugin into 2007.2 and refer to libmokopanelui2.
+	* configure.ac:
+	Import panel-plugin into 2007.2 and refer to libmokopanelui2.
 

Modified: trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-gps/src/openmoko-panel-gps.c
===================================================================
--- trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-gps/src/openmoko-panel-gps.c	2007-09-02 18:03:39 UTC (rev 2892)
+++ trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-gps/src/openmoko-panel-gps.c	2007-09-02 18:15:06 UTC (rev 2893)
@@ -1,6 +1,6 @@
 /*  openmoko-panel-gps.c
  *
- *  Authored by
+ *  Authored by Michael 'Mickey' Lauer <mickey at openmoko.org>
  *  Copyright (C) 2007 OpenMoko Inc.
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -20,7 +20,7 @@
 #include <time.h>
 
 typedef struct {
-    GtkImage *image;
+    int dummy;
 } GpsApplet;
 
 static void
@@ -29,7 +29,7 @@
     g_slice_free (GpsApplet, applet);
 }
 
-G_MODULE_EXPORT GtkWidget* 
+G_MODULE_EXPORT GtkWidget*
 mb_panel_applet_create(const char* id, GtkOrientation orientation)
 {
     MokoPanelApplet* mokoapplet = moko_panel_applet_new();
@@ -40,11 +40,7 @@
 
     applet = g_slice_new (GpsApplet);
 
-    applet->image = GTK_IMAGE(gtk_image_new_from_file ( PKGDATADIR "/GPS.png"));
-    gtk_widget_set_name( applet->image, "openmoko-gps-applet" );
-    g_object_weak_ref( G_OBJECT(applet->image), (GWeakNotify) gps_applet_free, applet );
-
-    moko_panel_applet_set_widget( GTK_CONTAINER(mokoapplet), applet->image );
+    moko_panel_applet_set_icon( GTK_CONTAINER(mokoapplet), PKGDATADIR "/GPS.png" );
     gtk_widget_show_all( GTK_WIDGET(mokoapplet) );
     return GTK_WIDGET(mokoapplet);
 };

Modified: trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-usb/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-usb/ChangeLog	2007-09-02 18:03:39 UTC (rev 2892)
+++ trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-usb/ChangeLog	2007-09-02 18:15:06 UTC (rev 2893)
@@ -1,5 +1,9 @@
-2007-07-30  Michael Lauer <mickey at openmoko.org>
+2007-09-02	Michael Lauer <mickey at openmoko.org>
 
-        * configure.ac:
-        Import panel-plugin into 2007.2 and refer to libmokopanelui2.
+	* src/openmoko-panel-gps:
+	Use moko_panel_applet_set_icon to set the icon.
 
+2007-07-30	Michael Lauer <mickey at openmoko.org>
+
+	* configure.ac:
+	Import panel-plugin into 2007.2 and refer to libmokopanelui2.

Modified: trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-usb/src/openmoko-panel-usb.c
===================================================================
--- trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-usb/src/openmoko-panel-usb.c	2007-09-02 18:03:39 UTC (rev 2892)
+++ trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-usb/src/openmoko-panel-usb.c	2007-09-02 18:15:06 UTC (rev 2893)
@@ -20,7 +20,7 @@
 #include <time.h>
 
 typedef struct {
-    GtkImage *image;
+    int dummy;
 } UsbApplet;
 
 static void
@@ -29,7 +29,7 @@
     g_slice_free (UsbApplet, applet);
 }
 
-G_MODULE_EXPORT GtkWidget* 
+G_MODULE_EXPORT GtkWidget*
 mb_panel_applet_create(const char* id, GtkOrientation orientation)
 {
     MokoPanelApplet* mokoapplet = moko_panel_applet_new();
@@ -40,11 +40,8 @@
 
     applet = g_slice_new (UsbApplet);
 
-    applet->image = GTK_IMAGE(gtk_image_new_from_file ( PKGDATADIR "/Usb.png"));
-    gtk_widget_set_name( applet->image, "openmoko-usb-applet" );
-    g_object_weak_ref( G_OBJECT(applet->image), (GWeakNotify) usb_applet_free, applet );
+    moko_panel_applet_set_icon( mokoapplet, PKGDATADIR "/Usb.png" );
 
-    moko_panel_applet_set_widget( GTK_CONTAINER(mokoapplet), applet->image );
     gtk_widget_show_all( GTK_WIDGET(mokoapplet) );
     return GTK_WIDGET(mokoapplet);
 };





More information about the commitlog mailing list