[oe-commits] org.oe.dev openmoko-panel-bt: add patch from http://bugzilla.openmoko.org/cgi-bin/bugzilla/show_bug.cgi?id=639

[koen commit]

openmoko-panel-bt: add patch from http://bugzilla.openmoko.org/cgi-bin/bugzilla/show_bug.cgi?id=639

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: c9d279c1def92b822860d56b49131291512583d4
ViewMTN: http://monotone.openembedded.org/revision.psp?id=c9d279c1def92b822860d56b49131291512583d4
Files:
1
packages/openmoko-panel-plugins/files
packages/openmoko-panel-plugins/files/panel-bluetooth.patch
packages/openmoko-panel-plugins/openmoko-panel-bt_svn.bb
Diffs:

#
# mt diff -r00076a86baaeaaec8316cc4c41bcf4a4cb508d51 -rc9d279c1def92b822860d56b49131291512583d4
#
# 
# 
# add_dir "packages/openmoko-panel-plugins/files"
# 
# add_file "packages/openmoko-panel-plugins/files/panel-bluetooth.patch"
#  content [9af47324f3cfaec964652bfd97e83c7bfc901861]
# 
# patch "packages/openmoko-panel-plugins/openmoko-panel-bt_svn.bb"
#  from [de0f23e02d59acbd6e4e117219493b427db63b57]
#    to [6e521caad13fbaa7a8b7e22d99d9897266550696]
# 
============================================================
--- packages/openmoko-panel-plugins/files/panel-bluetooth.patch	9af47324f3cfaec964652bfd97e83c7bfc901861
+++ packages/openmoko-panel-plugins/files/panel-bluetooth.patch	9af47324f3cfaec964652bfd97e83c7bfc901861
@@ -0,0 +1,174 @@
+Index: src/openmoko-panel-bt.c
+===================================================================
+--- a/src/openmoko-panel-bt.c	(revision 2567)
++++ b/src/openmoko-panel-bt.c	(working copy)
+@@ -17,18 +17,131 @@
+ #include <libmokopanelui2/moko-panel-applet.h>
+ 
+ #include <gtk/gtkimage.h>
++#include <gtk/gtkbox.h>
++#include <gtk/gtk.h>
+ #include <time.h>
++#include <stdlib.h>
++#include <stdio.h>
+ 
++
+ typedef struct {
+-    GtkImage *image;
++  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),
++                      okay_button);
++
++   gtk_window_set_title(GTK_WINDOW(dialog), "Bt Status");
++
++   /* Add the label, and show everything we've added to the dialog. */
++
++   gtk_container_add (GTK_CONTAINER (GTK_DIALOG(dialog)->vbox),
++                      label);
++   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 
++read_bt_power(void)
++{
++  FILE * f = fopen(BT_POWERON_FILENAME, "r+");
++  int val;
++
++  if (f == NULL) return -1;
++
++  fscanf(f, "%i", &val);
++  fclose(f);
++  return val;
++}
++
++static int 
++set_bt_power(int val)
++{
++  FILE * f = fopen(BT_POWERON_FILENAME, "w");
++
++  if (f == NULL) return -1;
++
++  fprintf(f, "%i\n", val);
++
++  fclose(f);
++
++  return val;
++}
++
+ 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;
++  }
++}
++
++
++
++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");
++}
++
++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");
++}
++
++
++static void 
++bt_applet_status(GtkWidget* menu, BtApplet* applet)
++{
++  int ret;
++  char tmp_string[256];
++
++  ret = read_bt_power();
++
++  sprintf(tmp_string, "  Bluetooth is %s  \n\n", ret ? "on" : "off");
++
++  quick_message(tmp_string); 
++  
++}
++
++static void
+ bt_applet_free (BtApplet *applet)
+ {
+     g_slice_free (BtApplet, applet);
+ }
+ 
++
++
+ G_MODULE_EXPORT GtkWidget* 
+ mb_panel_applet_create(const char* id, GtkOrientation orientation)
+ {
+@@ -40,11 +153,33 @@
+ 
+     applet = g_slice_new (BtApplet);
+ 
+-    applet->image = GTK_IMAGE(gtk_image_new_from_file ( PKGDATADIR "/Bluetooth_Off.png"));
++    applet->state = read_bt_power();
++    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 );
++    gtk_widget_show_all( GTK_WIDGET(applet->mokoapplet) );
++  
+ 
+-    moko_panel_applet_set_widget( GTK_CONTAINER(mokoapplet), applet->image );
+-    gtk_widget_show_all( GTK_WIDGET(mokoapplet) );
++    GtkMenu* menu = GTK_MENU(gtk_menu_new());
++    GtkWidget* item1 = gtk_menu_item_new_with_label("Power-Up Bluetooth radio");
++    g_signal_connect(G_OBJECT(item1), "activate", G_CALLBACK(bt_applet_power_on), applet);
++    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item1);
++    GtkWidget* item2 = gtk_menu_item_new_with_label("Power-Off Bluetooth radio");
++    g_signal_connect(G_OBJECT(item2), "activate", G_CALLBACK(bt_applet_power_off), applet);
++    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item2);
++    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);
+ };
============================================================
--- packages/openmoko-panel-plugins/openmoko-panel-bt_svn.bb	de0f23e02d59acbd6e4e117219493b427db63b57
+++ packages/openmoko-panel-plugins/openmoko-panel-bt_svn.bb	6e521caad13fbaa7a8b7e22d99d9897266550696
@@ -1,6 +1,9 @@ PV = "0.1.0+svn${SVNREV}"
 DESCRIPTION = "Shows the bluetooth status in the OpenMoko panel"
 DEPENDS = "bluez-libs"
 PV = "0.1.0+svn${SVNREV}"
+PR = "r1"
 
 inherit openmoko-panel-plugin
 
+SRC_URI += "file://panel-bluetooth.patch;patch=1" 
+