File google-gadgets-issue311.patch of Package google-gadgets

Index: hosts/gtk/sidebar_gtk_host.cc
===================================================================
--- hosts/gtk/sidebar_gtk_host.cc	(revision 1238)
+++ hosts/gtk/sidebar_gtk_host.cc	(revision 1239)
@@ -800,8 +800,11 @@
                           reinterpret_cast<guchar *>(&struts), 12);
     } else {
       has_strut_ = false;
-      gdk_property_delete(sidebar_window_->window, net_wm_strut_);
-      gdk_property_delete(sidebar_window_->window, net_wm_strut_partial_);
+      if (net_wm_strut_ != GDK_NONE)
+        gdk_property_delete(sidebar_window_->window, net_wm_strut_);
+      if (net_wm_strut_partial_ != GDK_NONE)
+        gdk_property_delete(sidebar_window_->window, net_wm_strut_partial_);
+
       sidebar_host_->SetWindowType((flags_ & MATCHBOX_WORKAROUND) ?
                                    GDK_WINDOW_TYPE_HINT_DIALOG :
                                    GDK_WINDOW_TYPE_HINT_NORMAL);

Property changes on: .
___________________________________________________________________
Modified: svk:merge
   - 0e8d722b-3639-4e33-b4a1-cadbd7132e97:/local/trunk:397
13b57dfe-ce4a-0410-b720-fc9a85a963e3:/local/trunk:501
19ce527f-b2f3-4807-a573-d8ac8348dae7:/local-branches/webkit-porting:1493
19ce527f-b2f3-4807-a573-d8ac8348dae7:/local-trunk:1606
19ce527f-b2f3-4807-a573-d8ac8348dae7:/local/trunk:1409
1bbdc759-f934-0410-94f1-a90c52dc07f7:/branches/drawing-opti:1182
1bbdc759-f934-0410-94f1-a90c52dc07f7:/branches/webkit-porting:1197
37cf5526-1f35-0410-837a-d07828e3b56a:/local/trunk:199
3b160213-ce4e-0410-bae8-c9841730d377:/local/trunk:735
3b160213-ce4e-0410-bae8-c9841730d377:/new_local/trunk:915
4ac95757-5bce-448d-bd2a-a38e8ecea5b4:/local/trunk:984
5fc71125-3c85-4672-bb51-04026b729556:/gadgets-branch-suzhe/trunk:78
6a4d1af9-2261-4fde-88b4-0665c62b28cd:/local/trunk:863
776d14a2-4399-423f-a9a3-8e41d97e6225:/local/trunk:272
99105a4c-5f54-4dab-a823-0b6b62ef8bf1:/local/trunk:943
e13eb7b3-b178-4056-a1fa-527168377256:/local-branches/drawing-opti:1474
e13eb7b3-b178-4056-a1fa-527168377256:/local-branches/webkit-porting:1466
e13eb7b3-b178-4056-a1fa-527168377256:/local-trunk:1538
e95379ee-d44d-4038-bfb7-3f07bdd999a3:/local/trunk:577
   + 0e8d722b-3639-4e33-b4a1-cadbd7132e97:/local/trunk:397
13b57dfe-ce4a-0410-b720-fc9a85a963e3:/local/trunk:501
19ce527f-b2f3-4807-a573-d8ac8348dae7:/local-branches/webkit-porting:1493
19ce527f-b2f3-4807-a573-d8ac8348dae7:/local-trunk:1606
19ce527f-b2f3-4807-a573-d8ac8348dae7:/local/trunk:1409
1bbdc759-f934-0410-94f1-a90c52dc07f7:/branches/drawing-opti:1182
1bbdc759-f934-0410-94f1-a90c52dc07f7:/branches/webkit-porting:1197
37cf5526-1f35-0410-837a-d07828e3b56a:/local/trunk:199
3b160213-ce4e-0410-bae8-c9841730d377:/local/trunk:735
3b160213-ce4e-0410-bae8-c9841730d377:/new_local/trunk:915
4ac95757-5bce-448d-bd2a-a38e8ecea5b4:/local/trunk:984
5fc71125-3c85-4672-bb51-04026b729556:/gadgets-branch-suzhe/trunk:78
6a4d1af9-2261-4fde-88b4-0665c62b28cd:/local/trunk:863
776d14a2-4399-423f-a9a3-8e41d97e6225:/local/trunk:272
99105a4c-5f54-4dab-a823-0b6b62ef8bf1:/local/trunk:943
c235bf8b-7b81-4f4b-9e11-f8b09ca4620a:/local-trunk:1242
e13eb7b3-b178-4056-a1fa-527168377256:/local-branches/drawing-opti:1474
e13eb7b3-b178-4056-a1fa-527168377256:/local-branches/webkit-porting:1466
e13eb7b3-b178-4056-a1fa-527168377256:/local-trunk:1538
e95379ee-d44d-4038-bfb7-3f07bdd999a3:/local/trunk:577