Send commitlog mailing list submissions to
        [email protected]

To subscribe or unsubscribe via the World Wide Web, visit
        http://lists.openmoko.org/mailman/listinfo/commitlog
or, via email, send a message with subject or body 'help' to
        [EMAIL PROTECTED]

You can reach the person managing the list at
        [EMAIL PROTECTED]

When replying, please edit your Subject line so it is more specific
than "Re: Contents of commitlog digest..."
Today's Topics:

   1. r4364 -
      trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit
      ([EMAIL PROTECTED])
   2. r4365 - developers/werner ([EMAIL PROTECTED])
   3. r4366 - developers/werner ([EMAIL PROTECTED])
   4. r4367 - in
      trunk/src/target/OM-2007.2/libraries/moko-gtk-engine: .
      data/gtk-2.0 src ([EMAIL PROTECTED])
   5. r4368 - in
      trunk/src/target/OM-2007.2/libraries/moko-gtk-engine: .
      data/gtk-2.0 ([EMAIL PROTECTED])
   6. r4369 - in
      trunk/src/target/OM-2007.2/libraries/moko-gtk-engine: .
      data/gtk-2.0 ([EMAIL PROTECTED])
   7. r4370 - in
      trunk/src/target/OM-2007.2/libraries/moko-gtk-engine: . src
      ([EMAIL PROTECTED])
--- Begin Message ---
Author: sean_chiang
Date: 2008-04-16 12:48:54 +0200 (Wed, 16 Apr 2008)
New Revision: 4364

Modified:
   
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/dialer-main.c
Log:
avoid the race

Modified: 
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/dialer-main.c
===================================================================
--- 
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/dialer-main.c
        2008-04-15 16:31:30 UTC (rev 4363)
+++ 
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/dialer-main.c
        2008-04-16 10:48:54 UTC (rev 4364)
@@ -368,7 +368,7 @@
                        moko_sound_profile_set(SOUND_PROFILE_HEADSET);
                        g_debug("SOUND_PROFILE_HEADSET\n");
                }       
-               return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+               return DBUS_HANDLER_RESULT_HANDLED;
        }
        else if ( dbus_message_is_signal( msg,"org.openmoko.PhoneKit.Headset", 
"HeadsetOut" ) )
        {
@@ -383,7 +383,7 @@
                        moko_sound_profile_set(SOUND_PROFILE_STEREO_OUT);
                        g_debug("SOUND_PROFILE_STEREO_OUT\n");
                }       
-               return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+               return DBUS_HANDLER_RESULT_HANDLED;
        }
 
        g_debug( "(unknown dbus message, ignoring)" );
@@ -414,11 +414,7 @@
      return 1;
   }   
 
-  dbus_connection_setup_with_g_main (bus, NULL);
 
-  dbus_bus_add_match (bus, "type='signal'", &err);
-  dbus_connection_add_filter (bus, headset_signal_filter, NULL, NULL);  
-
   /* initialise type system */
   g_type_init ();
 
@@ -486,6 +482,11 @@
                                        SMS_PATH,
                                        G_OBJECT (sms));
 
+  dbus_connection_setup_with_g_main (bus, NULL);
+
+  dbus_bus_add_match (bus, 
"type='signal',interface='org.openmoko.PhoneKit.Headset'", &err);
+  dbus_connection_add_filter (bus, headset_signal_filter, NULL, NULL);  
+
   /* Sync phonebook */
   /* XXX this is not the right place! */
   pb_sync (pb, network);




--- End Message ---
--- Begin Message ---
Author: werner
Date: 2008-04-16 13:36:29 +0200 (Wed, 16 Apr 2008)
New Revision: 4365

Added:
   developers/werner/bm.fig
   developers/werner/bm.pdf
Log:
Boot menu invocation timing.



Added: developers/werner/bm.fig
===================================================================
--- developers/werner/bm.fig    2008-04-16 10:48:54 UTC (rev 4364)
+++ developers/werner/bm.fig    2008-04-16 11:36:29 UTC (rev 4365)
@@ -0,0 +1,77 @@
+#FIG 3.2  Produced by xfig version 3.2.5
+Landscape
+Center
+Inches
+Letter  
+100.00
+Single
+-2
+1200 2
+2 1 0 2 0 7 50 -1 -1 0.000 0 0 -1 0 0 4
+        2700 1500 3300 1500 3300 900 9000 900
+2 1 0 2 0 7 50 -1 -1 0.000 0 0 -1 0 0 4
+        2700 2700 3900 2700 3900 2100 9000 2100
+2 1 1 2 0 7 50 -1 -1 6.000 0 0 -1 0 0 2
+        9000 900 9900 900
+2 1 1 2 0 7 50 -1 -1 6.000 0 0 -1 0 0 2
+        9000 2100 9900 2100
+2 1 0 2 0 7 50 -1 -1 6.000 0 0 -1 0 0 4
+        9900 900 10200 900 10200 1500 10800 1500
+2 1 0 2 0 7 50 -1 -1 6.000 0 0 -1 0 0 4
+        9900 2100 10200 2100 10200 2700 10800 2700
+2 1 0 2 0 7 50 -1 -1 6.000 0 0 -1 0 0 4
+        2700 3900 8400 3900 8400 3300 9000 3300
+2 1 0 2 0 7 50 -1 -1 6.000 0 0 -1 0 0 6
+        2700 5100 6000 5100 6000 4500 6300 4500 6300 5100 10800 5100
+2 1 1 2 0 7 50 -1 -1 6.000 0 0 -1 0 0 2
+        9000 3300 10800 3300
+2 1 0 1 0 7 50 -1 -1 4.000 0 0 -1 0 0 2
+        3300 1575 3300 6300
+2 1 0 1 0 7 50 -1 -1 4.000 0 0 -1 0 0 2
+        3900 2775 3900 6300
+2 1 0 1 0 7 50 -1 -1 4.000 0 0 -1 0 0 2
+        6300 5175 6300 6300
+2 1 0 1 0 7 50 -1 -1 4.000 0 0 -1 1 1 2
+       1 1 1.00 60.00 120.00
+       1 1 1.00 60.00 120.00
+        3375 5400 6225 5400
+2 1 0 1 0 7 50 -1 -1 4.000 0 0 -1 1 1 2
+       1 1 1.00 60.00 120.00
+       1 1 1.00 60.00 120.00
+        3975 6000 6225 6000
+2 1 0 1 0 7 50 -1 -1 4.000 0 0 -1 1 1 2
+       1 1 1.00 60.00 120.00
+       1 1 1.00 60.00 120.00
+        3375 6000 3825 6000
+2 1 0 1 0 7 50 -1 -1 4.000 0 0 -1 0 0 2
+        8400 3975 8400 5700
+2 1 0 1 0 7 50 -1 -1 4.000 0 0 -1 0 0 2
+        10200 2775 10200 5700
+2 1 0 1 0 7 50 -1 -1 4.000 0 0 -1 0 0 2
+        10200 1575 10200 2025
+2 1 0 1 0 7 50 -1 -1 4.000 0 0 -1 1 1 2
+       1 1 1.00 60.00 120.00
+       1 1 1.00 60.00 120.00
+        8475 5400 10125 5400
+2 1 0 1 0 7 50 -1 -1 4.000 0 0 -1 1 1 2
+       1 1 1.00 60.00 120.00
+       1 1 1.00 60.00 120.00
+        6375 5400 8325 5400
+2 2 0 2 0 7 50 -1 -1 6.000 0 0 -1 0 0 5
+        2625 6825 4425 6825 4425 7575 2625 7575 2625 6825
+2 2 0 2 7 7 50 -1 -1 6.000 0 0 -1 0 0 5
+        900 600 11100 600 11100 7950 900 7950 900 600
+4 1 0 50 -1 18 24 0.0000 4 315 1485 1800 1350 POWER\001
+4 1 0 50 -1 18 24 0.0000 4 315 885 1800 2550 AUX\001
+4 1 0 50 -1 18 24 0.0000 4 315 810 1800 4950 LED\001
+4 1 0 50 -1 18 24 0.0000 4 315 900 1800 3750 LCM\001
+4 1 0 50 -1 18 12 0.0000 4 165 435 4800 5700 Tled\001
+4 1 0 50 -1 18 12 0.0000 4 165 450 3600 6300 Tinit\001
+4 1 0 50 -1 18 12 0.0000 4 165 480 5100 6300 Taux\001
+4 1 0 50 -1 18 12 0.0000 4 165 585 7350 5700 Thold\001
+4 1 0 50 -1 18 12 0.0000 4 165 390 9300 5700 Trel\001
+4 0 0 50 -1 18 12 0.0000 4 165 1500 2775 7125 Tinit = ~100ms\001
+4 0 0 50 -1 18 12 0.0000 4 165 960 2775 7425 Taux > 0s\001
+4 0 0 50 -1 18 12 0.0000 4 165 1065 5475 7125 Tled = ~2s\001
+4 0 0 50 -1 18 12 0.0000 4 165 1395 5475 7425 Thold = ~1-2s\001
+4 0 0 50 -1 18 12 0.0000 4 165 1005 5475 7725 Trel >= 0s\001

Added: developers/werner/bm.pdf
===================================================================
(Binary files differ)


Property changes on: developers/werner/bm.pdf
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream




--- End Message ---
--- Begin Message ---
Author: werner
Date: 2008-04-16 13:55:00 +0200 (Wed, 16 Apr 2008)
New Revision: 4366

Modified:
   developers/werner/bm.fig
   developers/werner/bm.pdf
Log:
Added opper bound for Tinit, for clarification.



Modified: developers/werner/bm.fig
===================================================================
--- developers/werner/bm.fig    2008-04-16 11:36:29 UTC (rev 4365)
+++ developers/werner/bm.fig    2008-04-16 11:55:00 UTC (rev 4366)
@@ -57,10 +57,10 @@
        1 1 1.00 60.00 120.00
        1 1 1.00 60.00 120.00
         6375 5400 8325 5400
-2 2 0 2 0 7 50 -1 -1 6.000 0 0 -1 0 0 5
-        2625 6825 4425 6825 4425 7575 2625 7575 2625 6825
 2 2 0 2 7 7 50 -1 -1 6.000 0 0 -1 0 0 5
         900 600 11100 600 11100 7950 900 7950 900 600
+2 2 0 2 0 7 50 -1 -1 6.000 0 0 -1 0 0 5
+        2625 6825 5325 6825 5325 7575 2625 7575 2625 6825
 4 1 0 50 -1 18 24 0.0000 4 315 1485 1800 1350 POWER\001
 4 1 0 50 -1 18 24 0.0000 4 315 885 1800 2550 AUX\001
 4 1 0 50 -1 18 24 0.0000 4 315 810 1800 4950 LED\001
@@ -70,8 +70,8 @@
 4 1 0 50 -1 18 12 0.0000 4 165 480 5100 6300 Taux\001
 4 1 0 50 -1 18 12 0.0000 4 165 585 7350 5700 Thold\001
 4 1 0 50 -1 18 12 0.0000 4 165 390 9300 5700 Trel\001
-4 0 0 50 -1 18 12 0.0000 4 165 1500 2775 7125 Tinit = ~100ms\001
+4 0 0 50 -1 18 12 0.0000 4 165 2430 2775 7125 ~100ms <= Tinit <= Tled\001
 4 0 0 50 -1 18 12 0.0000 4 165 960 2775 7425 Taux > 0s\001
-4 0 0 50 -1 18 12 0.0000 4 165 1065 5475 7125 Tled = ~2s\001
-4 0 0 50 -1 18 12 0.0000 4 165 1395 5475 7425 Thold = ~1-2s\001
-4 0 0 50 -1 18 12 0.0000 4 165 1005 5475 7725 Trel >= 0s\001
+4 0 0 50 -1 18 12 0.0000 4 165 1065 6375 7125 Tled = ~2s\001
+4 0 0 50 -1 18 12 0.0000 4 165 1395 6375 7425 Thold = ~1-2s\001
+4 0 0 50 -1 18 12 0.0000 4 165 1005 6375 7725 Trel >= 0s\001

Modified: developers/werner/bm.pdf
===================================================================
(Binary files differ)




--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2008-04-16 16:18:30 +0200 (Wed, 16 Apr 2008)
New Revision: 4367

Modified:
   trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/ChangeLog
   trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/gtk-2.0/gtkrc
   trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/src/moko-draw.c
Log:
2008-04-16  Thomas Wood  <[EMAIL PROTECTED]>

        * data/gtk-2.0/gtkrc: Add and adjust some insensitive colours
        * src/moko-draw.c: (moko_draw_layout),(moko_draw_style_class_init):
        Implement draw_layout to improve insensitive text


Modified: trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/ChangeLog      
2008-04-16 11:55:00 UTC (rev 4366)
+++ trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/ChangeLog      
2008-04-16 14:18:30 UTC (rev 4367)
@@ -1,3 +1,9 @@
+2008-04-16  Thomas Wood  <[EMAIL PROTECTED]>
+
+       * data/gtk-2.0/gtkrc: Add and adjust some insensitive colours
+       * src/moko-draw.c: (moko_draw_layout),(moko_draw_style_class_init):
+       Implement draw_layout to improve insensitive text
+
 2008-04-04  Thomas Wood  <[EMAIL PROTECTED]>
 
        * data/gtk-2.0/gtkrc: Darken "base" widgets.

Modified: 
trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/gtk-2.0/gtkrc
===================================================================
--- trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/gtk-2.0/gtkrc     
2008-04-16 11:55:00 UTC (rev 4366)
+++ trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/gtk-2.0/gtkrc     
2008-04-16 14:18:30 UTC (rev 4367)
@@ -60,7 +60,7 @@
   fg [NORMAL] = @fg_color
   fg [PRELIGHT] = @fg_color
   fg [ACTIVE] = @selected_fg_color
-  fg [INSENSITIVE] = @fg_color
+  fg [INSENSITIVE] = darker (@fg_color)
   fg [SELECTED] = @selected_fg_color
 
   bg [NORMAL] = @bg_color
@@ -73,10 +73,12 @@
   text [PRELIGHT] = @text_color
   text [SELECTED] = @text_color
   text [ACTIVE] = @text_color
+  text [INSENSITIVE] = lighter (@text_color)
 
   base [NORMAL] = @base_color
   base [SELECTED] = @selected_bg_color
   base [ACTIVE] = @base_color
+  base [INSENSITIVE] = darker (@base_color)
 
   engine "moko-engine" {
   }

Modified: trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/src/moko-draw.c
===================================================================
--- trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/src/moko-draw.c        
2008-04-16 11:55:00 UTC (rev 4366)
+++ trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/src/moko-draw.c        
2008-04-16 14:18:30 UTC (rev 4367)
@@ -206,7 +206,29 @@
 }
 
 
+static void
+moko_draw_layout (GtkStyle *style,  GdkWindow *window,
+                  GtkStateType state_type, gboolean use_text,
+                  GdkRectangle *area, GtkWidget *widget,
+                  const char *detail, int x, int y, PangoLayout *layout)
+{
+  GdkGC *gc;
 
+  gc = use_text ? style->text_gc[state_type] : style->fg_gc[state_type];
+
+  if (area)
+  {
+    gdk_gc_set_clip_rectangle (gc, area);
+  }
+
+  gdk_draw_layout (window, gc, x, y, layout);
+
+  if (area)
+  {
+    gdk_gc_set_clip_rectangle (gc, NULL);
+  }
+}
+
 void
 moko_draw_style_class_init (GtkStyleClass * style_class)
 {
@@ -223,5 +245,6 @@
   style_class->draw_focus = moko_draw_focus;
   style_class->draw_vline = moko_draw_vline;
   style_class->draw_hline = moko_draw_hline;
+  style_class->draw_layout = moko_draw_layout;
 
 }




--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2008-04-16 16:38:12 +0200 (Wed, 16 Apr 2008)
New Revision: 4368

Modified:
   trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/COPYING
   trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/ChangeLog
   trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/gtk-2.0/gtkrc
Log:
2008-04-16  Thomas Wood  <[EMAIL PROTECTED]>

        * data/gtk-2.0/gtkrc: Increase the size of scrollbars slightly and
        remove double stepper buttons


Modified: trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/COPYING
===================================================================
--- trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/COPYING        
2008-04-16 14:18:30 UTC (rev 4367)
+++ trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/COPYING        
2008-04-16 14:38:12 UTC (rev 4368)
@@ -1 +1 @@
-link /usr/share/automake-1.7/COPYING
\ No newline at end of file
+link /usr/share/automake-1.10/COPYING
\ No newline at end of file

Modified: trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/ChangeLog      
2008-04-16 14:18:30 UTC (rev 4367)
+++ trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/ChangeLog      
2008-04-16 14:38:12 UTC (rev 4368)
@@ -1,5 +1,10 @@
 2008-04-16  Thomas Wood  <[EMAIL PROTECTED]>
 
+       * data/gtk-2.0/gtkrc: Increase the size of scrollbars slightly and
+       remove double stepper buttons
+
+2008-04-16  Thomas Wood  <[EMAIL PROTECTED]>
+
        * data/gtk-2.0/gtkrc: Add and adjust some insensitive colours
        * src/moko-draw.c: (moko_draw_layout),(moko_draw_style_class_init):
        Implement draw_layout to improve insensitive text

Modified: 
trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/gtk-2.0/gtkrc
===================================================================
--- trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/gtk-2.0/gtkrc     
2008-04-16 14:18:30 UTC (rev 4367)
+++ trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/gtk-2.0/gtkrc     
2008-04-16 14:38:12 UTC (rev 4368)
@@ -32,14 +32,14 @@
   GtkFrame::shadow_type = GTK_SHADOW_NONE
   GtkPaned::handle-size = 16
   GtkRange::slider-width = 28
-  GtkRange::trough_border = 0
+  GtkRange::trough_border = 2
   GtkScale::slider-length = 56
   GtkScrollbar::has_backward_stepper = 1
   GtkScrollbar::has_forward_stepper = 1
-  GtkScrollbar::has_secondary_backward_stepper = 1
-  GtkScrollbar::has_secondary_forward_stepper = 1
-  GtkScrollbar::slider_width = 30
-  GtkScrollbar::stepper_size = 26
+  GtkScrollbar::has_secondary_backward_stepper = 0
+  GtkScrollbar::has_secondary_forward_stepper = 0
+  GtkScrollbar::slider_width = 32
+  GtkScrollbar::stepper_size = 32
   GtkScrollbar::stepper_spacing = 0
   GtkSpinButton::shadow_type = GTK_SHADOW_NONE
   GtkTreeView::allow_rules = 1




--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2008-04-16 16:45:08 +0200 (Wed, 16 Apr 2008)
New Revision: 4369

Modified:
   trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/ChangeLog
   trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/gtk-2.0/gtkrc
Log:
2008-04-16  Thomas Wood  <[EMAIL PROTECTED]>

        * data/gtk-2.0/gtkrc: Fix labels font colour on inactive tabs


Modified: trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/ChangeLog      
2008-04-16 14:38:12 UTC (rev 4368)
+++ trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/ChangeLog      
2008-04-16 14:45:08 UTC (rev 4369)
@@ -1,5 +1,9 @@
 2008-04-16  Thomas Wood  <[EMAIL PROTECTED]>
 
+       * data/gtk-2.0/gtkrc: Fix labels font colour on inactive tabs
+
+2008-04-16  Thomas Wood  <[EMAIL PROTECTED]>
+
        * data/gtk-2.0/gtkrc: Increase the size of scrollbars slightly and
        remove double stepper buttons
 

Modified: 
trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/gtk-2.0/gtkrc
===================================================================
--- trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/gtk-2.0/gtkrc     
2008-04-16 14:38:12 UTC (rev 4368)
+++ trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/gtk-2.0/gtkrc     
2008-04-16 14:45:08 UTC (rev 4369)
@@ -133,7 +133,7 @@
   fg[ACTIVE] = @fg_color
   bg[ACTIVE] = shade (0.3, @bg_color)
 }
-widget_class "*GtkNotebook" style "notebook"
+widget_class "*GtkNotebook*" style "notebook"
 
 style "menuitem"
 {




--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2008-04-16 17:40:55 +0200 (Wed, 16 Apr 2008)
New Revision: 4370

Modified:
   trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/ChangeLog
   trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/src/moko-draw.c
Log:
2008-04-16  Thomas Wood  <[EMAIL PROTECTED]>

        * src/moko-draw.c: (moko_draw_box): Update remove prelight hack


Modified: trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/ChangeLog      
2008-04-16 14:45:08 UTC (rev 4369)
+++ trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/ChangeLog      
2008-04-16 15:40:55 UTC (rev 4370)
@@ -1,5 +1,9 @@
 2008-04-16  Thomas Wood  <[EMAIL PROTECTED]>
 
+       * src/moko-draw.c: (moko_draw_box): Update remove prelight hack
+
+2008-04-16  Thomas Wood  <[EMAIL PROTECTED]>
+
        * data/gtk-2.0/gtkrc: Fix labels font colour on inactive tabs
 
 2008-04-16  Thomas Wood  <[EMAIL PROTECTED]>

Modified: trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/src/moko-draw.c
===================================================================
--- trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/src/moko-draw.c        
2008-04-16 14:45:08 UTC (rev 4369)
+++ trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/src/moko-draw.c        
2008-04-16 15:40:55 UTC (rev 4370)
@@ -54,13 +54,30 @@
     x -= 10;
   }
 
-  /* "fix" for prelight active toggle buttons */
-  if (DETAIL ("button") && state_type == GTK_STATE_PRELIGHT && shadow_type == 
GTK_SHADOW_IN)
+  /* hack to remove prelight */
+  if (state_type == GTK_STATE_PRELIGHT
+      && !DETAIL ("menuitem") && !DETAIL ("bar"))
   {
-    state_type = GTK_STATE_ACTIVE;
+    if (widget && GTK_IS_TOGGLE_BUTTON (widget)
+        && shadow_type == GTK_SHADOW_IN)
+    {
+      state_type = GTK_STATE_ACTIVE;
+    }
+    else
+    {
+      if (widget && GTK_IS_BUTTON (widget)
+          && (gtk_button_get_relief (GTK_BUTTON (widget)) == GTK_RELIEF_NONE))
+      {
+        /* none relief buttons shouldn't draw anything for "normal" state */
+        return;
+      }
+      else
+      {
+        state_type = GTK_STATE_NORMAL;
+      }
+    }
   }
 
-
   if (DETAIL ("trough"))
     gc = style->base_gc[state_type];
   else if (DETAIL ("bar"))




--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog

Reply via email to