59 lines
2.2 KiB
Diff
59 lines
2.2 KiB
Diff
From b43e268e738e8754eaa3d0e38a0cb5859f254241 Mon Sep 17 00:00:00 2001
|
|
From: Cosimo Cecchi <cosimoc@gnome.org>
|
|
Date: Fri, 11 Jun 2010 13:20:05 +0200
|
|
Subject: [PATCH 053/249] [src] GSEAL nautilus-application.
|
|
|
|
---
|
|
src/nautilus-application.c | 18 +++++++++++-------
|
|
1 files changed, 11 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/src/nautilus-application.c b/src/nautilus-application.c
|
|
index 06d8509..1f048e3 100644
|
|
--- a/src/nautilus-application.c
|
|
+++ b/src/nautilus-application.c
|
|
@@ -1046,7 +1046,7 @@ get_desktop_manager_selection (GdkDisplay *display, int screen)
|
|
if (gtk_selection_owner_set_for_display (display,
|
|
selection_widget,
|
|
selection_atom,
|
|
- gdk_x11_get_server_time (selection_widget->window))) {
|
|
+ gdk_x11_get_server_time (gtk_widget_get_window (selection_widget)))) {
|
|
|
|
g_signal_connect (selection_widget, "selection_get",
|
|
G_CALLBACK (selection_get_cb), NULL);
|
|
@@ -1860,22 +1860,26 @@ nautilus_application_get_session_data (void)
|
|
xmlNewProp (win_node, "type", NAUTILUS_IS_NAVIGATION_WINDOW (window) ? "navigation" : "spatial");
|
|
|
|
if (NAUTILUS_IS_NAVIGATION_WINDOW (window)) { /* spatial windows store their state as file metadata */
|
|
+ GdkWindow *gdk_window;
|
|
+
|
|
tmp = eel_gtk_window_get_geometry_string (GTK_WINDOW (window));
|
|
xmlNewProp (win_node, "geometry", tmp);
|
|
g_free (tmp);
|
|
|
|
- if (GTK_WIDGET (window)->window &&
|
|
- gdk_window_get_state (GTK_WIDGET (window)->window) & GDK_WINDOW_STATE_MAXIMIZED) {
|
|
+ gdk_window = gtk_widget_get_window (GTK_WIDGET (window));
|
|
+
|
|
+ if (gdk_window &&
|
|
+ gdk_window_get_state (gdk_window) & GDK_WINDOW_STATE_MAXIMIZED) {
|
|
xmlNewProp (win_node, "maximized", "TRUE");
|
|
}
|
|
|
|
- if (GTK_WIDGET (window)->window &&
|
|
- gdk_window_get_state (GTK_WIDGET (window)->window) & GDK_WINDOW_STATE_STICKY) {
|
|
+ if (gdk_window &&
|
|
+ gdk_window_get_state (gdk_window) & GDK_WINDOW_STATE_STICKY) {
|
|
xmlNewProp (win_node, "sticky", "TRUE");
|
|
}
|
|
|
|
- if (GTK_WIDGET (window)->window &&
|
|
- gdk_window_get_state (GTK_WIDGET (window)->window) & GDK_WINDOW_STATE_ABOVE) {
|
|
+ if (gdk_window &&
|
|
+ gdk_window_get_state (gdk_window) & GDK_WINDOW_STATE_ABOVE) {
|
|
xmlNewProp (win_node, "keep-above", "TRUE");
|
|
}
|
|
}
|
|
--
|
|
1.7.2
|
|
|