GNOME.org
 

[gnome-themes/gtk-3: 3/4] Switch to GTK+ 3.0

commit e71cb871ae3aaaf38f1ab742cbb3a0f9a7307d71
Author: Thomas Wood <thos gnome org>
Date:   Sun Jul 25 01:13:58 2010 +0100

    Switch to GTK+ 3.0

 BSOD/INSTALL_BSOD                                  |    4 ++--
 BSOD/{gtk-2.0 => gtk-3.0}/gtkrc                    |    0
 README                                             |    4 ++--
 configure.in                                       |    7 ++-----
 gtk-themes/ClearlooksClassic/Makefile.am           |    2 +-
 gtk-themes/ClearlooksTest/Makefile.am              |    2 +-
 gtk-themes/Glider/Makefile.am                      |    2 +-
 gtk-themes/Glossy/Makefile.am                      |    2 +-
 gtk-themes/HighContrast/Makefile.am                |    2 +-
 gtk-themes/HighContrastInverse/Makefile.am         |    2 +-
 gtk-themes/HighContrastLargePrint/Makefile.am      |    2 +-
 .../HighContrastLargePrintInverse/Makefile.am      |    2 +-
 gtk-themes/Inverted/Makefile.am                    |    2 +-
 gtk-themes/LargePrint/Makefile.am                  |    2 +-
 gtk-themes/LowContrast/Makefile.am                 |    2 +-
 gtk-themes/LowContrastLargePrint/Makefile.am       |    2 +-
 gtk-themes/Simple/Makefile.am                      |    2 +-
 17 files changed, 19 insertions(+), 22 deletions(-)
---
diff --git a/BSOD/INSTALL_BSOD b/BSOD/INSTALL_BSOD
index bcc7d13..b50f312 100755
--- a/BSOD/INSTALL_BSOD
+++ b/BSOD/INSTALL_BSOD
@@ -8,10 +8,10 @@
 # Copy the gtk stuff into $HOME/.themes
 mkdir $HOME/.themes > /dev/null 2>&1
 mkdir $HOME/.themes/BSOD > /dev/null 2>&1
-cp -r index.theme gtk-2.0 pixmaps $HOME/.themes/BSOD > /dev/null 2>&1
+cp -r index.theme gtk-3.0 pixmaps $HOME/.themes/BSOD > /dev/null 2>&1
 
 # Set the pixmap_path correctly; it doesn't recognise $HOME unfortunately
-sed -e "s|xHOMEx|$HOME|" gtk-2.0/gtkrc > $HOME/.themes/BSOD/gtk-2.0/gtkrc
+sed -e "s|xHOMEx|$HOME|" gtk-3.0/gtkrc > $HOME/.themes/BSOD/gtk-3.0/gtkrc
 
 # Copy the icon stuff into $HOME/.icons
 mkdir $HOME/.icons > /dev/null 2>&1
diff --git a/BSOD/gtk-2.0/gtkrc b/BSOD/gtk-3.0/gtkrc
similarity index 100%
rename from BSOD/gtk-2.0/gtkrc
rename to BSOD/gtk-3.0/gtkrc
diff --git a/README b/README
index 6c1357a..2c7b4cf 100644
--- a/README
+++ b/README
@@ -18,7 +18,7 @@ The 'gnome' theme is in the gnome-icon-theme module, and has to be built and ins
 
 The gtkrc.in files for each a11y theme are currently generated by autogen.sh. Each gtkrc.in file is the concatenation of these files:
 
-$theme/gtk-2.0/$theme.rc 
+$theme/gtk-3.0/$theme.rc 
 common/gtk-stock-icons.rc 
 common/panel-stock-icons.rc 
 common/media-stock-icons.rc 
@@ -50,7 +50,7 @@ The icon sizes for ALL the LargePrint themes are defined in configure.in.  Chang
 4.  Changing colours
 --------------------
 
-To change the colours in a particular theme, edit its <themename>/gtk-2.0/<themename>.rc file.
+To change the colours in a particular theme, edit its <themename>/gtk-3.0/<themename>.rc file.
 
 
 5. Switching icon themes
diff --git a/configure.in b/configure.in
index be8bb7f..7726900 100644
--- a/configure.in
+++ b/configure.in
@@ -28,12 +28,9 @@ AC_SUBST(localedir)
 AC_SUBST(ACLOCAL_AMFLAGS, "\${ACLOCAL_FLAGS}")
 
 # Check GTK+ theme engines
-PKG_CHECK_MODULES(THEME_ENGINE,
- [gtk+-2.0 >= 2.0.0 dnl
-  gdk-pixbuf-2.0 >= 2.0.0 dnl
-  gtk-engines-2 >= 2.15.3 ])
+PKG_CHECK_MODULES(THEME_ENGINE, [gtk+-3.0 gtk-engines-3])
 
-GTK_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0`
+GTK_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-3.0`
 AC_SUBST(GTK_VERSION)
 
 # Check if it's a development (odd minor) version
diff --git a/gtk-themes/ClearlooksClassic/Makefile.am b/gtk-themes/ClearlooksClassic/Makefile.am
index c33cde2..6ca5534 100644
--- a/gtk-themes/ClearlooksClassic/Makefile.am
+++ b/gtk-themes/ClearlooksClassic/Makefile.am
@@ -1,4 +1,4 @@
-themedir = $(datadir)/themes/ClearlooksClassic/gtk-2.0
+themedir = $(datadir)/themes/ClearlooksClassic/gtk-3.0
 
 theme_DATA = gtkrc
 
diff --git a/gtk-themes/ClearlooksTest/Makefile.am b/gtk-themes/ClearlooksTest/Makefile.am
index 1ee4a90..1221fe9 100644
--- a/gtk-themes/ClearlooksTest/Makefile.am
+++ b/gtk-themes/ClearlooksTest/Makefile.am
@@ -1,4 +1,4 @@
-themedir = $(datadir)/themes/ClearlooksTest/gtk-2.0
+themedir = $(datadir)/themes/ClearlooksTest/gtk-3.0
 
 theme_DATA = gtkrc
 
diff --git a/gtk-themes/Glider/Makefile.am b/gtk-themes/Glider/Makefile.am
index 9445b24..2a2f023 100644
--- a/gtk-themes/Glider/Makefile.am
+++ b/gtk-themes/Glider/Makefile.am
@@ -1,4 +1,4 @@
-themedir = $(datadir)/themes/Glider/gtk-2.0
+themedir = $(datadir)/themes/Glider/gtk-3.0
 
 theme_DATA = gtkrc
 
diff --git a/gtk-themes/Glossy/Makefile.am b/gtk-themes/Glossy/Makefile.am
index ad2f7ee..05bfbb6 100644
--- a/gtk-themes/Glossy/Makefile.am
+++ b/gtk-themes/Glossy/Makefile.am
@@ -1,4 +1,4 @@
-themedir = $(datadir)/themes/Glossy/gtk-2.0
+themedir = $(datadir)/themes/Glossy/gtk-3.0
 
 theme_DATA = gtkrc
 
diff --git a/gtk-themes/HighContrast/Makefile.am b/gtk-themes/HighContrast/Makefile.am
index 143ea77..4171499 100644
--- a/gtk-themes/HighContrast/Makefile.am
+++ b/gtk-themes/HighContrast/Makefile.am
@@ -1,4 +1,4 @@
-themedir = $(datadir)/themes/HighContrast/gtk-2.0
+themedir = $(datadir)/themes/HighContrast/gtk-3.0
 
 theme_DATA = gtkrc
 
diff --git a/gtk-themes/HighContrastInverse/Makefile.am b/gtk-themes/HighContrastInverse/Makefile.am
index fd52b18..88fa90c 100644
--- a/gtk-themes/HighContrastInverse/Makefile.am
+++ b/gtk-themes/HighContrastInverse/Makefile.am
@@ -1,4 +1,4 @@
-themedir = $(datadir)/themes/HighContrastInverse/gtk-2.0
+themedir = $(datadir)/themes/HighContrastInverse/gtk-3.0
 
 theme_DATA = gtkrc
 
diff --git a/gtk-themes/HighContrastLargePrint/Makefile.am b/gtk-themes/HighContrastLargePrint/Makefile.am
index f88ba7b..e7ddabd 100644
--- a/gtk-themes/HighContrastLargePrint/Makefile.am
+++ b/gtk-themes/HighContrastLargePrint/Makefile.am
@@ -1,4 +1,4 @@
-themedir = $(datadir)/themes/HighContrastLargePrint/gtk-2.0
+themedir = $(datadir)/themes/HighContrastLargePrint/gtk-3.0
 
 theme_DATA = gtkrc
 
diff --git a/gtk-themes/HighContrastLargePrintInverse/Makefile.am b/gtk-themes/HighContrastLargePrintInverse/Makefile.am
index 4338caa..6513507 100644
--- a/gtk-themes/HighContrastLargePrintInverse/Makefile.am
+++ b/gtk-themes/HighContrastLargePrintInverse/Makefile.am
@@ -1,4 +1,4 @@
-themedir = $(datadir)/themes/HighContrastLargePrintInverse/gtk-2.0
+themedir = $(datadir)/themes/HighContrastLargePrintInverse/gtk-3.0
 
 theme_DATA = gtkrc
 
diff --git a/gtk-themes/Inverted/Makefile.am b/gtk-themes/Inverted/Makefile.am
index 0ebe350..8fec6a9 100644
--- a/gtk-themes/Inverted/Makefile.am
+++ b/gtk-themes/Inverted/Makefile.am
@@ -1,4 +1,4 @@
-themedir = $(datadir)/themes/Inverted/gtk-2.0
+themedir = $(datadir)/themes/Inverted/gtk-3.0
 
 theme_DATA = gtkrc
 
diff --git a/gtk-themes/LargePrint/Makefile.am b/gtk-themes/LargePrint/Makefile.am
index 3d5a449..07c6c41 100644
--- a/gtk-themes/LargePrint/Makefile.am
+++ b/gtk-themes/LargePrint/Makefile.am
@@ -1,4 +1,4 @@
-themedir = $(datadir)/themes/LargePrint/gtk-2.0
+themedir = $(datadir)/themes/LargePrint/gtk-3.0
 
 theme_DATA = gtkrc
 
diff --git a/gtk-themes/LowContrast/Makefile.am b/gtk-themes/LowContrast/Makefile.am
index 8b586d1..04536c6 100644
--- a/gtk-themes/LowContrast/Makefile.am
+++ b/gtk-themes/LowContrast/Makefile.am
@@ -1,4 +1,4 @@
-themedir = $(datadir)/themes/LowContrast/gtk-2.0
+themedir = $(datadir)/themes/LowContrast/gtk-3.0
 
 theme_DATA = gtkrc
 
diff --git a/gtk-themes/LowContrastLargePrint/Makefile.am b/gtk-themes/LowContrastLargePrint/Makefile.am
index b683ef4..3a605af 100644
--- a/gtk-themes/LowContrastLargePrint/Makefile.am
+++ b/gtk-themes/LowContrastLargePrint/Makefile.am
@@ -1,4 +1,4 @@
-themedir = $(datadir)/themes/LowContrastLargePrint/gtk-2.0
+themedir = $(datadir)/themes/LowContrastLargePrint/gtk-3.0
 
 theme_DATA = gtkrc
 
diff --git a/gtk-themes/Simple/Makefile.am b/gtk-themes/Simple/Makefile.am
index c6ff012..dfded46 100644
--- a/gtk-themes/Simple/Makefile.am
+++ b/gtk-themes/Simple/Makefile.am
@@ -1,4 +1,4 @@
-themedir = $(datadir)/themes/Simple/gtk-2.0
+themedir = $(datadir)/themes/Simple/gtk-3.0
 
 theme_DATA = gtkrc
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]