summaryrefslogtreecommitdiff
path: root/gpe-bluetooth
diff options
context:
space:
mode:
authorPhil Blundell <philb@gnu.org>2004-10-19 21:45:56 +0000
committerPhil Blundell <philb@gnu.org>2004-10-19 21:45:56 +0000
commit83459291350a9ea7330e4c64968f298a2ea8fb06 (patch)
tree82c27acb58bff2473ba59b36f9b9720f4194f78a /gpe-bluetooth
parentca4a817ae8bc9d807b7475f97d1fc98ad5e237c0 (diff)
Merge bk://openembedded@openembedded.bkbits.net/packages
into stealth.nexus.co.uk:/home/pb/oe/oe-packages 2004/10/19 22:40:32+01:00 nexus.co.uk!pb add -lxf86drm to via final link 2004/10/19 22:21:51+01:00 nexus.co.uk!pb enable initscripts 2004/10/19 22:21:14+01:00 nexus.co.uk!pb correct icon name BKrev: 41758b14kapIf9odK4fNTo44aTa0pQ
Diffstat (limited to 'gpe-bluetooth')
-rw-r--r--gpe-bluetooth/gpe-bluetooth-0.37/icon-resize.patch43
-rw-r--r--gpe-bluetooth/gpe-bluetooth_0.37.oe2
2 files changed, 44 insertions, 1 deletions
diff --git a/gpe-bluetooth/gpe-bluetooth-0.37/icon-resize.patch b/gpe-bluetooth/gpe-bluetooth-0.37/icon-resize.patch
index e69de29bb2..2580d9c3c8 100644
--- a/gpe-bluetooth/gpe-bluetooth-0.37/icon-resize.patch
+++ b/gpe-bluetooth/gpe-bluetooth-0.37/icon-resize.patch
@@ -0,0 +1,43 @@
+diff -u -r1.52 main.c
+--- gpe-bluetooth/main.c 7 Sep 2004 00:01:17 -0000 1.52
++++ gpe-bluetooth/main.c 19 Oct 2004 08:16:27 -0000
+@@ -503,6 +503,22 @@
+ g_timeout_add (time, (GSourceFunc) cancel_dock_message, (gpointer)id);
+ }
+
++gboolean
++configure_event (GtkWidget *window, GdkEventConfigure *event, GdkBitmap *bitmap)
++{
++ GdkPixbuf *buf;
++ int xoff, yoff;
++
++ buf = gpe_find_icon ("bt-off");
++
++ xoff = (event->width - gdk_pixbuf_get_width (buf)) / 2;
++ yoff = (event->height - gdk_pixbuf_get_height (buf)) / 2;
++
++ gtk_widget_shape_combine_mask (window, bitmap, xoff, yoff);
++
++ return FALSE;
++}
++
+ int
+ main (int argc, char *argv[])
+ {
+@@ -572,14 +588,14 @@
+ icon = gtk_image_new_from_pixbuf (gpe_find_icon (radio_is_on ? "bt-on" : "bt-off"));
+ gtk_widget_show (icon);
+ gdk_pixbuf_render_pixmap_and_mask (gpe_find_icon ("bt-off"), NULL, &bitmap, 255);
+- gtk_widget_shape_combine_mask (window, bitmap, 2, 0);
+- gdk_bitmap_unref (bitmap);
++ gtk_widget_shape_combine_mask (window, bitmap, 0, 0);
+
+ gpe_set_window_icon (window, "bt-on");
+
+ tooltips = gtk_tooltips_new ();
+ gtk_tooltips_set_tip (GTK_TOOLTIPS (tooltips), window, _("This is the Bluetooth control.\nTap here to turn the radio on and off, or to see a list of Bluetooth devices."), NULL);
+
++ g_signal_connect (G_OBJECT (window), "configure-event", G_CALLBACK (configure_event), bitmap);
+ g_signal_connect (G_OBJECT (window), "button-press-event", G_CALLBACK (clicked), NULL);
+ gtk_widget_add_events (window, GDK_BUTTON_PRESS_MASK);
+
diff --git a/gpe-bluetooth/gpe-bluetooth_0.37.oe b/gpe-bluetooth/gpe-bluetooth_0.37.oe
index 240408580d..337db4553b 100644
--- a/gpe-bluetooth/gpe-bluetooth_0.37.oe
+++ b/gpe-bluetooth/gpe-bluetooth_0.37.oe
@@ -6,7 +6,7 @@ RDEPENDS = "bluez-utils blueprobe"
MAINTAINER = "Phil Blundell <pb@handhelds.org>"
SECTION = "gpe"
PRIORITY = "optional"
-PR = "r2"
+PR = "r3"
FILES_${PN} += '${datadir}/bluez-pin'