r2895 - in trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-bt: . src
mickey at sita.openmoko.org
mickey at sita.openmoko.org
Sun Sep 2 22:02:16 CEST 2007
Author: mickey
Date: 2007-09-02 22:02:12 +0200 (Sun, 02 Sep 2007)
New Revision: 2895
Modified:
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-bt/ChangeLog
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-bt/src/openmoko-panel-bt.c
Log:
openmoko-panel-bt: catch up with libmokopanelui2, reindent
Modified: trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-bt/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-bt/ChangeLog 2007-09-02 19:52:27 UTC (rev 2894)
+++ trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-bt/ChangeLog 2007-09-02 20:02:12 UTC (rev 2895)
@@ -1,11 +1,16 @@
+2007-09-02 Michael Lauer <mickey at openmoko.org>
+
+ * src/openmoko-panel-bt.c:
+ Catch up with libmokopanelui2, reindent contribution to match rest of file
+
2007-08-29 Stefan Schmidt <stefan at openmoko.org>
- * src/openmoko-panel-bt.c:
- Allow applet to turn the bt radio on and off. Patch from Alexandre
- d'Alton <alex at alexdalton.org> (Closes #639)
+ * src/openmoko-panel-bt.c:
+ Allow applet to turn the bt radio on and off. Patch from Alexandre
+ d'Alton <alex at alexdalton.org> (Closes #639)
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-bt/src/openmoko-panel-bt.c
===================================================================
--- trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-bt/src/openmoko-panel-bt.c 2007-09-02 19:52:27 UTC (rev 2894)
+++ trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-bt/src/openmoko-panel-bt.c 2007-09-02 20:02:12 UTC (rev 2895)
@@ -1,6 +1,6 @@
/* openmoko-panel-bt.c
*
- * Authored by
+ * Authored by Michael Lauer <mickey at openmoko.org>
* Copyright (C) 2007 OpenMoko Inc.
*
* This program is free software; you can redistribute it and/or modify
@@ -12,7 +12,6 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser Public License for more details.
*
- * Current Version: $Rev$ ($Date$) [$Author: mickey $]
*/
#include <libmokopanelui2/moko-panel-applet.h>
@@ -23,25 +22,25 @@
#include <stdlib.h>
#include <stdio.h>
+#define BT_POWERON_FILENAME "/sys/class/i2c-dev/i2c-0/device/0-0008/gta01-pm-bt.0/power_on"
typedef struct {
MokoPanelApplet *mokoapplet;
- GtkImage *image;
int state;
} BtApplet;
void quick_message(gchar *message) {
GtkWidget *dialog, *label, *okay_button;
-
+
/* Create the widgets */
-
+
dialog = gtk_dialog_new();
label = gtk_label_new (message);
okay_button = gtk_button_new_with_label("Okay");
-
+
/* Ensure that the dialog box is destroyed when the user clicks ok. */
-
+
gtk_signal_connect_object (GTK_OBJECT (okay_button), "clicked",
GTK_SIGNAL_FUNC (gtk_widget_destroy), dialog);
gtk_container_add (GTK_CONTAINER (GTK_DIALOG(dialog)->action_area),
@@ -56,9 +55,7 @@
gtk_widget_show_all (dialog);
}
-#define BT_POWERON_FILENAME "/sys/class/i2c-dev/i2c-0/device/0-0008/gta01-pm-bt.0/power_on"
-
-static int
+static int
read_bt_power(void)
{
FILE * f = fopen(BT_POWERON_FILENAME, "r+");
@@ -71,7 +68,7 @@
return val;
}
-static int
+static int
set_bt_power(int val)
{
FILE * f = fopen(BT_POWERON_FILENAME, "w");
@@ -88,50 +85,43 @@
static void
mb_panel_update(BtApplet *applet, int state)
{
-
- if(applet->state != state) {
- printf("Will change the image ... \n");
- if (state == 1)
- gtk_image_set_from_file(applet->image, PKGDATADIR "/Bluetooth_On.png");
- else
- gtk_image_set_from_file(applet->image, PKGDATADIR "/Bluetooth_Off.png");
- applet->state = state;
- }
+ if ( applet->state != state )
+ {
+ moko_panel_applet_set_icon( applet->mokoapplet, state == 1 ? PKGDATADIR "/Bluetooth_On.png" : PKGDATADIR "/Bluetooth_Off.png");
+ applet->state = state;
+ }
}
-
-
-static void
+static void
bt_applet_power_on(GtkWidget* menu, BtApplet* applet)
{
- int ret;
- ret = set_bt_power(1);
- mb_panel_update(applet, 1);
- quick_message(" Bluetooth turned on \n\n");
+ int ret;
+ ret = set_bt_power(1);
+ mb_panel_update(applet, 1);
+ quick_message(" Bluetooth turned on \n\n");
}
-static void
+static void
bt_applet_power_off(GtkWidget* menu, BtApplet* applet)
{
- int ret;
- ret = set_bt_power(0);
- mb_panel_update(applet, 0);
- quick_message(" Bluetooth turned off \n\n");
+ int ret;
+ ret = set_bt_power(0);
+ mb_panel_update(applet, 0);
+ quick_message(" Bluetooth turned off \n\n");
}
-static void
+static void
bt_applet_status(GtkWidget* menu, BtApplet* applet)
{
- int ret;
- char tmp_string[256];
+ int ret;
+ char tmp_string[256];
- ret = read_bt_power();
+ ret = read_bt_power();
- sprintf(tmp_string, " Bluetooth is %s \n\n", ret ? "on" : "off");
+ sprintf(tmp_string, " Bluetooth is %s \n\n", ret ? "on" : "off");
- quick_message(tmp_string);
-
+ quick_message(tmp_string);
}
static void
@@ -140,9 +130,7 @@
g_slice_free (BtApplet, applet);
}
-
-
-G_MODULE_EXPORT GtkWidget*
+G_MODULE_EXPORT GtkWidget*
mb_panel_applet_create(const char* id, GtkOrientation orientation)
{
MokoPanelApplet* mokoapplet = moko_panel_applet_new();
@@ -153,19 +141,11 @@
applet = g_slice_new (BtApplet);
- applet->state = read_bt_power();
+ applet->state = -1;
applet->mokoapplet = mokoapplet;
-
- if (applet->state == 0) {
- applet->image = GTK_IMAGE(gtk_image_new_from_file ( PKGDATADIR "/Bluetooth_Off.png"));
- } else {
- applet->image = GTK_IMAGE(gtk_image_new_from_file ( PKGDATADIR "/Bluetooth_On.png"));
- }
- gtk_widget_set_name( applet->image, "openmoko-bt-applet" );
- g_object_weak_ref( G_OBJECT(applet->image), (GWeakNotify) bt_applet_free, applet );
- moko_panel_applet_set_widget( GTK_CONTAINER(applet->mokoapplet), applet->image );
+
+ mb_panel_update( applet, read_bt_power() );
gtk_widget_show_all( GTK_WIDGET(applet->mokoapplet) );
-
GtkMenu* menu = GTK_MENU(gtk_menu_new());
GtkWidget* item1 = gtk_menu_item_new_with_label("Power-Up Bluetooth radio");
@@ -177,9 +157,9 @@
GtkWidget* item3 = gtk_menu_item_new_with_label("Bluetooth status");
g_signal_connect(G_OBJECT(item3), "activate", G_CALLBACK(bt_applet_status), applet);
gtk_menu_shell_append(GTK_MENU_SHELL(menu), item3);
-
+
gtk_widget_show_all(GTK_WIDGET(menu));
moko_panel_applet_set_popup( mokoapplet, GTK_WIDGET(menu), MOKO_PANEL_APPLET_CLICK_POPUP);
return GTK_WIDGET(mokoapplet);
-};
+}
More information about the commitlog
mailing list
