File gnome-shell-fix-recent-gtk3.patch of Package gnome-shell

Overview Repositories Revisions Requests Users Attributes Meta

File gnome-shell-fix-recent-gtk3.patch of Package gnome-shell (Revision 2d22bdeb1413809a13721677adfd8edc)

Currently displaying revision 2d22bdeb1413809a13721677adfd8edc , Show latest

commit cac0848316cd3327c37b401cb527eb7a313f71a6
Author: Owen W. Taylor <otaylor@fishsoup.net>
Date:   Thu Aug 12 20:12:00 2010 -0400

Remove usage of gdk_screen_get_rgb_colormap()
    
    gdk_screen_get_rgb_colormap() has been removed from GTK+; there's
    no longer a special visual that is used for drawing true-color
    images distinct from the system visual. So, we don't need to
    check for it; if the visual isn't the system visual, we just
    fall through to the case where we create a new GdkColormap.

diff --git a/src/tray/na-tray-child.c b/src/tray/na-tray-child.c
index 978880c..067c0bf 100644
--- a/src/tray/na-tray-child.c
+++ b/src/tray/na-tray-child.c
@@ -265,9 +265,7 @@ na_tray_child_new (GdkScreen *screen,
 
   new_colormap = FALSE;
 
-  if (visual == gdk_screen_get_rgb_visual (screen))
-    colormap = gdk_screen_get_rgb_colormap (screen);
-  else if (visual == gdk_screen_get_rgba_visual (screen))
+  if (visual == gdk_screen_get_rgba_visual (screen))
     colormap = gdk_screen_get_rgba_colormap (screen);
   else if (visual == gdk_screen_get_system_visual (screen))
     colormap = gdk_screen_get_system_colormap (screen);
--
From 178c8c50a0ad42fd58496fc70ca17597f8c20754 Mon Sep 17 00:00:00 2001
From: Maxim Ermilov <zaspire@rambler.ru>
Date: Thu, 09 Sep 2010 14:25:30 +0000
Subject: Fix build with recent gtk3

use new keysyms names
https://bugzilla.gnome.org/show_bug.cgi?id=629128
---
diff --git a/configure.ac b/configure.ac
index d46260a..f3b1a45 100644
--- a/configure.ac
+++ b/configure.ac
@@ -61,7 +61,7 @@ CLUTTER_MIN_VERSION=1.2.8
 GOBJECT_INTROSPECTION_MIN_VERSION=0.6.11
 GJS_MIN_VERSION=0.7
 MUTTER_MIN_VERSION=2.31.4
-GTK_MIN_VERSION=2.90.4
+GTK_MIN_VERSION=2.90.7
 GIO_MIN_VERSION=2.25.9
 
 # Collect more than 20 libraries for a prize!
diff --git a/src/st/st-im-text.c b/src/st/st-im-text.c
index 29fd71e..23657ae 100644
--- a/src/st/st-im-text.c
+++ b/src/st/st-im-text.c
@@ -231,31 +231,31 @@ key_is_modifier (guint16 keyval)
 
   switch (keyval)
     {
-    case GDK_Shift_L:
-    case GDK_Shift_R:
-    case GDK_Control_L:
-    case GDK_Control_R:
-    case GDK_Caps_Lock:
-    case GDK_Shift_Lock:
-    case GDK_Meta_L:
-    case GDK_Meta_R:
-    case GDK_Alt_L:
-    case GDK_Alt_R:
-    case GDK_Super_L:
-    case GDK_Super_R:
-    case GDK_Hyper_L:
-    case GDK_Hyper_R:
-    case GDK_ISO_Lock:
-    case GDK_ISO_Level2_Latch:
-    case GDK_ISO_Level3_Shift:
-    case GDK_ISO_Level3_Latch:
-    case GDK_ISO_Level3_Lock:
-    case GDK_ISO_Level5_Shift:
-    case GDK_ISO_Level5_Latch:
-    case GDK_ISO_Level5_Lock:
-    case GDK_ISO_Group_Shift:
-    case GDK_ISO_Group_Latch:
-    case GDK_ISO_Group_Lock:
+    case GDK_KEY_Shift_L:
+    case GDK_KEY_Shift_R:
+    case GDK_KEY_Control_L:
+    case GDK_KEY_Control_R:
+    case GDK_KEY_Caps_Lock:
+    case GDK_KEY_Shift_Lock:
+    case GDK_KEY_Meta_L:
+    case GDK_KEY_Meta_R:
+    case GDK_KEY_Alt_L:
+    case GDK_KEY_Alt_R:
+    case GDK_KEY_Super_L:
+    case GDK_KEY_Super_R:
+    case GDK_KEY_Hyper_L:
+    case GDK_KEY_Hyper_R:
+    case GDK_KEY_ISO_Lock:
+    case GDK_KEY_ISO_Level2_Latch:
+    case GDK_KEY_ISO_Level3_Shift:
+    case GDK_KEY_ISO_Level3_Latch:
+    case GDK_KEY_ISO_Level3_Lock:
+    case GDK_KEY_ISO_Level5_Shift:
+    case GDK_KEY_ISO_Level5_Latch:
+    case GDK_KEY_ISO_Level5_Lock:
+    case GDK_KEY_ISO_Group_Shift:
+    case GDK_KEY_ISO_Group_Latch:
+    case GDK_KEY_ISO_Group_Lock:
       return TRUE;
     default:
       return FALSE;
--
cgit v0.8.3.1

Places

File gnome-shell-fix-recent-gtk3.patch of Package gnome-shell (Revision 2d22bdeb1413809a13721677adfd8edc)

Places