callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix some assignments involving booleans. (#346467, Christian Persch)

Browse Source 
2006-07-05  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkwindow.c (gtk_window_unmap, gtk_window_set_keep_above)
	(gtk_window_set_keep_below): Fix some assignments involving
	booleans.  (#346467, Christian Persch)
This commit is contained in:
Matthias Clasen
2006-07-05 16:22:50 +00:00
committed by Matthias Clasen
parent 9f3f53b53c
commit d7418f894f
3 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2006-07-05 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkwindow.c (gtk_window_unmap, gtk_window_set_keep_above)
(gtk_window_set_keep_below): Fix some assignments involving
booleans. (#346467, Christian Persch)
2006-07-03 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkgamma.c: Use serialized pixbufs instead of xpms.

6
ChangeLog.pre-2-10
View File

@ -1,3 +1,9 @@
2006-07-05 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkwindow.c (gtk_window_unmap, gtk_window_set_keep_above)
(gtk_window_set_keep_below): Fix some assignments involving
booleans. (#346467, Christian Persch)
2006-07-03 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkgamma.c: Use serialized pixbufs instead of xpms.

14
gtk/gtkwindow.c
View File

@ -4208,11 +4208,11 @@ gtk_window_unmap (GtkWidget *widget)
}
state = gdk_window_get_state (widget->window);
window->iconify_initially = state & GDK_WINDOW_STATE_ICONIFIED;
window->maximize_initially = state & GDK_WINDOW_STATE_MAXIMIZED;
window->stick_initially = state & GDK_WINDOW_STATE_STICKY;
priv->above_initially = state & GDK_WINDOW_STATE_ABOVE;
priv->below_initially = state & GDK_WINDOW_STATE_BELOW;
window->iconify_initially = (state & GDK_WINDOW_STATE_ICONIFIED) != 0;
window->maximize_initially = (state & GDK_WINDOW_STATE_MAXIMIZED) != 0;
window->stick_initially = (state & GDK_WINDOW_STATE_STICKY) != 0;
priv->above_initially = (state & GDK_WINDOW_STATE_ABOVE) != 0;
priv->below_initially = (state & GDK_WINDOW_STATE_BELOW) != 0;
}
static void
@ -6597,7 +6597,7 @@ gtk_window_set_keep_above (GtkWindow *window,
widget = GTK_WIDGET (window);
priv = GTK_WINDOW_GET_PRIVATE (window);
priv->above_initially = setting;
priv->above_initially = setting != FALSE;
if (setting)
priv->below_initially = FALSE;
@ -6651,7 +6651,7 @@ gtk_window_set_keep_below (GtkWindow *window,
widget = GTK_WIDGET (window);
priv = GTK_WINDOW_GET_PRIVATE (window);
priv->below_initially = setting;
priv->below_initially = setting != FALSE;
if (setting)
priv->above_initially = FALSE;