removed the "widget &&" part from "widget && GTK_IS_FOO (widget)" checks.

2006-08-03  Michael Natterer  <mitch@imendio.com>

	* gtk/gtkstyle.c: removed the "widget &&" part from
	"widget && GTK_IS_FOO (widget)" checks.

diff --git a/ChangeLog b/ChangeLog
index 33115586c091266ddf16eb616de309d62d28f362..9b69b259a17c680db12ef03efbcd2470face2751 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-08-03  Michael Natterer  <mitch@imendio.com>
+
+       * gtk/gtkstyle.c: removed the "widget &&" part from
+       "widget && GTK_IS_FOO (widget)" checks.
+
 2006-07-13  Michael Emmel  <mike.emmel@gmail.com>
 
        * gdk/directfb/gdkwindow-directfb.c

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 33115586c091266ddf16eb616de309d62d28f362..9b69b259a17c680db12ef03efbcd2470face2751 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2006-08-03  Michael Natterer  <mitch@imendio.com>
+
+       * gtk/gtkstyle.c: removed the "widget &&" part from
+       "widget && GTK_IS_FOO (widget)" checks.
+
 2006-07-13  Michael Emmel  <mike.emmel@gmail.com>
 
        * gdk/directfb/gdkwindow-directfb.c

diff --git a/gtk/gtkstyle.c b/gtk/gtkstyle.c
index f3c071d6239e1dc3e967f8bef793d2b7481eb49b..58f4d0ef9aefba05d35ed9c5e1c31ba1fa01930e 100644 (file)
--- a/gtk/gtkstyle.c
+++ b/gtk/gtkstyle.c
@@ -2458,7 +2458,7 @@ gtk_default_draw_shadow (GtkStyle      *style,
   
   if (shadow_type == GTK_SHADOW_IN)
     {
-      if (detail && (strcmp (detail, "buttondefault") == 0))
+      if (detail && strcmp (detail, "buttondefault") == 0)
        {
          sanitize_size (window, &width, &height);
 
@@ -2473,7 +2473,7 @@ gtk_default_draw_shadow (GtkStyle      *style,
                            x, y, width, height);
          return;
        }
-      if (widget && GTK_IS_SPIN_BUTTON (widget) &&
+      if (GTK_IS_SPIN_BUTTON (widget) &&
          detail && strcmp (detail, "spinbutton") == 0)
        {
          draw_spinbutton_shadow (style, window, state_type, 
@@ -2711,7 +2711,7 @@ gtk_default_draw_shadow (GtkStyle      *style,
     }
 
   if (shadow_type == GTK_SHADOW_IN &&
-      widget && GTK_IS_SPIN_BUTTON (widget) &&
+      GTK_IS_SPIN_BUTTON (widget) &&
       detail && strcmp (detail, "entry") == 0)
     {
       if (get_direction (widget) == GTK_TEXT_DIR_LTR)
@@ -3261,7 +3261,7 @@ gtk_default_draw_box (GtkStyle      *style,
   
   sanitize_size (window, &width, &height);
 
-  if (widget && GTK_IS_SPIN_BUTTON (widget) && detail)
+  if (GTK_IS_SPIN_BUTTON (widget) && detail)
     {
       if (strcmp (detail, "spinbutton_up") == 0)
        {