← Back to branch summary

~gnome3-team/gnome-screensaver/ubuntu

« back to all changes in this revision

Viewing changes to debian/patches/00git_gdk_window_get_geometry.patch

  • Committer: Robert Ancell
  • Date: 2010-12-10 04:26:24 UTC
  • Revision ID: robert.ancell@canonical.com-20101210042624-dtb0yaeaamwewuus
* New upstream release
* debian/control:
  - Bump build-depends on libgnome-desktop-3-dev
  - Build-depend on libxklavier-dev
* debian/patches/00git_gdk_window_get_geometry.patch:
  - Build with the latest GTK
* debian/patches/00git_gnome_bg.patch:
* debian/patches/00git_gnome_rr.patch:
* debian/patches/00git_size_request.patch:
* debian/patches/01_libxklavier.patch:
  - Applied upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/00git_gdk_window_get_geometry.patch
 
1
From e6b8ff62886d4d7d7b5dcfed617d7bb53c7612a1 Mon Sep 17 00:00:00 2001
 
2
From: Matthias Clasen <mclasen@redhat.com>
 
3
Date: Thu, 09 Dec 2010 12:18:09 +0000
 
4
Subject: Fix build with latest gtk
 
5
 
 
6
gdk_window_get_geometry lost its depth argument.
 
7
---
 
8
diff --git a/savers/gs-theme-engine.c b/savers/gs-theme-engine.c
 
9
index 724a7c2..8e0c7e9 100644
 
10
--- a/savers/gs-theme-engine.c
 
11
+++ b/savers/gs-theme-engine.c
 
12
@@ -195,11 +195,7 @@ gs_theme_engine_get_window_size (GSThemeEngine *engine,
 
13
         }
 
14
 
 
15
         gdk_window_get_geometry (gtk_widget_get_window (GTK_WIDGET (engine)),
 
16
-                                 NULL,
 
17
-                                 NULL,
 
18
-                                 width,
 
19
-                                 height,
 
20
-                                 NULL);
 
21
+                                 NULL, NULL, width, height);
 
22
 }
 
23
 
 
24
 GdkWindow *
 
25
diff --git a/savers/gs-theme-window.c b/savers/gs-theme-window.c
 
26
index 7adc6ed..e0e9aed 100644
 
27
--- a/savers/gs-theme-window.c
 
28
+++ b/savers/gs-theme-window.c
 
29
@@ -179,7 +179,7 @@ gs_theme_window_real_realize (GtkWidget *widget)
 
30
         gdk_window_set_user_data (window, widget);
 
31
         gtk_widget_set_realized (widget, TRUE);
 
32
 
 
33
-        gdk_window_get_geometry (window, &x, &y, &width, &height, NULL);
 
34
+        gdk_window_get_geometry (window, &x, &y, &width, &height);
 
35
 
 
36
         if (width < MIN_SIZE || height < MIN_SIZE) {
 
37
                 g_critical ("This window is way too small to use");
 
38
--
 
39
cgit v0.8.3.1