r603 - in trunk/src/target/OM-2007/panel-plugins: openmoko-panel-battery/src openmoko-panel-clock/src

mickey at sita.openmoko.org mickey at sita.openmoko.org
Thu Jan 25 02:49:57 CET 2007


Author: mickey
Date: 2007-01-25 02:49:57 +0100 (Thu, 25 Jan 2007)
New Revision: 603

Modified:
   trunk/src/target/OM-2007/panel-plugins/openmoko-panel-battery/src/openmoko-panel-battery.c
   trunk/src/target/OM-2007/panel-plugins/openmoko-panel-clock/src/openmoko-panel-clock.c
Log:
panel-plugins: backport battery and clock panel to glib 2.8 (no slice allocator)


Modified: trunk/src/target/OM-2007/panel-plugins/openmoko-panel-battery/src/openmoko-panel-battery.c
===================================================================
--- trunk/src/target/OM-2007/panel-plugins/openmoko-panel-battery/src/openmoko-panel-battery.c	2007-01-25 01:43:21 UTC (rev 602)
+++ trunk/src/target/OM-2007/panel-plugins/openmoko-panel-battery/src/openmoko-panel-battery.c	2007-01-25 01:49:57 UTC (rev 603)
@@ -31,8 +31,12 @@
 static void
 battery_applet_free (BatteryApplet *applet)
 {
-        g_source_remove (applet->timeout_id);
-        g_slice_free (BatteryApplet, applet);
+    g_source_remove (applet->timeout_id);
+#ifdef GLIB_HAS_SLICE_ALLOCATOR
+    g_slice_free (BatteryApplet, applet);
+#else
+    g_free (applet);
+#endif
 }
 
 /* Called every 5 minutes */
@@ -52,9 +56,11 @@
     BatteryApplet *applet;
     time_t t;
     struct tm *local_time;
-
+#ifdef GLIB_HAS_SLICE_ALLOCATOR
     applet = g_slice_new (BatteryApplet);
-
+#else
+    applet = g_new (BatteryApplet, 1);
+#endif
     applet->label = GTK_LABEL(gtk_label_new (NULL));
     gtk_widget_set_name( applet->label, "MatchboxPanelBattery" );
     g_object_weak_ref( G_OBJECT(applet->label), (GWeakNotify) battery_applet_free, applet );

Modified: trunk/src/target/OM-2007/panel-plugins/openmoko-panel-clock/src/openmoko-panel-clock.c
===================================================================
--- trunk/src/target/OM-2007/panel-plugins/openmoko-panel-clock/src/openmoko-panel-clock.c	2007-01-25 01:43:21 UTC (rev 602)
+++ trunk/src/target/OM-2007/panel-plugins/openmoko-panel-clock/src/openmoko-panel-clock.c	2007-01-25 01:49:57 UTC (rev 603)
@@ -33,8 +33,11 @@
 clock_applet_free (ClockApplet *applet)
 {
         g_source_remove (applet->timeout_id);
-
+#ifdef GLIB_HAS_SLICE_ALLOCATOR
         g_slice_free (ClockApplet, applet);
+#else
+        g_free (applet);
+#endif
 }
 
 /* Called every minute */
@@ -77,9 +80,11 @@
     ClockApplet *applet;
     time_t t;
     struct tm *local_time;
-
+#ifdef GLIB_HAS_SLICE_ALLOCATOR
     applet = g_slice_new (ClockApplet);
-
+#else
+    applet = g_new (ClockApplet, 1);
+#endif
     applet->label = GTK_LABEL(gtk_label_new (NULL));
     gtk_widget_set_name( applet->label, "MatchboxPanelClock" );
     g_object_weak_ref( G_OBJECT(applet->label), (GWeakNotify) clock_applet_free, applet );





More information about the commitlog mailing list