diff options
| author | Matthias Clasen <matthiasc@src.gnome.org> | 2008-06-02 21:56:29 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2008-06-02 21:56:29 +0000 |
| commit | d88a3d3f7f91a1b5cdb5f6c5a2a3622c52ecb9c2 (patch) | |
| tree | eacb479e93f07469c68220c873095af1e862caef | |
| parent | d554f8b4ffc4afbab6375ec6da7e770d616b10ea (diff) | |
| download | gdk-pixbuf-d88a3d3f7f91a1b5cdb5f6c5a2a3622c52ecb9c2.tar.gz | |
Bug 522269 - Evince windows sometimes incorrectly unmaximized,
caused by missing flag initialization
* gdk/x11/gdkwindow-x11.c (set_initial_hints): Initialize
top-level private flags correctly. Patch by Danny Baumann.
svn path=/branches/gtk-2-12/; revision=20279
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | gdk/x11/gdkwindow-x11.c | 4 |
2 files changed, 14 insertions, 0 deletions
@@ -2,6 +2,16 @@ Merge from trunk: + Bug 522269 - Evince windows sometimes incorrectly unmaximized, + caused by missing flag initialization + + * gdk/x11/gdkwindow-x11.c (set_initial_hints): Initialize + top-level private flags correctly. Patch by Danny Baumann. + +2008-06-02 Matthias Clasen <mclasen@redhat.com> + + Merge from trunk: + Bug 534463 - non-editable GtkTextView should not call gtk_im_context_focus_in in focus event diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c index ae4fab063..4c476a8c1 100644 --- a/gdk/x11/gdkwindow-x11.c +++ b/gdk/x11/gdkwindow-x11.c @@ -1326,6 +1326,7 @@ set_initial_hints (GdkWindow *window) atoms[i] = gdk_x11_get_xatom_by_name_for_display (display, "_NET_WM_STATE_MAXIMIZED_HORZ"); ++i; + toplevel->have_maxhorz = toplevel->have_maxvert = TRUE; } if (private->state & GDK_WINDOW_STATE_ABOVE) @@ -1347,6 +1348,7 @@ set_initial_hints (GdkWindow *window) atoms[i] = gdk_x11_get_xatom_by_name_for_display (display, "_NET_WM_STATE_STICKY"); ++i; + toplevel->have_sticky = TRUE; } if (private->state & GDK_WINDOW_STATE_FULLSCREEN) @@ -1354,6 +1356,7 @@ set_initial_hints (GdkWindow *window) atoms[i] = gdk_x11_get_xatom_by_name_for_display (display, "_NET_WM_STATE_FULLSCREEN"); ++i; + toplevel->have_fullscreen = TRUE; } if (private->modal_hint) @@ -1400,6 +1403,7 @@ set_initial_hints (GdkWindow *window) gdk_x11_get_xatom_by_name_for_display (display, "_NET_WM_DESKTOP"), XA_CARDINAL, 32, PropModeReplace, (guchar*) atoms, 1); + toplevel->on_all_desktops = TRUE; } else { |