GNOME.org
 

[gtk-engines/gnome3] Port all the engines to GTK+ 3.0

commit 920aa7c6eae9ae7b4e849988cef770d853618ba7
Author: Bastien Nocera <hadess hadess net>
Date:   Wed May 12 15:50:44 2010 +0100

    Port all the engines to GTK+ 3.0
    
    Fix compilation failures, build against GTK+ 3.0, and
    move themes and engines to their expected directories.

 configure.ac                                       |   20 ++++++++++----------
 engines/clearlooks/Makefile.am                     |    2 +-
 engines/clearlooks/src/support.c                   |   20 --------------------
 engines/clearlooks/src/support.h                   |    7 -------
 engines/crux/Makefile.am                           |    2 +-
 engines/glide/Makefile.am                          |    2 +-
 engines/hc/Makefile.am                             |    2 +-
 engines/industrial/Makefile.am                     |    2 +-
 engines/lua/Makefile.am                            |    2 +-
 engines/mist/Makefile.am                           |    2 +-
 engines/redmond/Makefile.am                        |    2 +-
 engines/thinice/Makefile.am                        |    2 +-
 themes/Clearlooks/Makefile.am                      |    2 +-
 themes/Crux/Makefile.am                            |    2 +-
 themes/Crux/{gtk-2.0 => gtk-3.0}/Makefile.am       |    0
 themes/Crux/{gtk-2.0 => gtk-3.0}/gtkrc             |    0
 themes/GNOME3/Makefile.am                          |    2 +-
 themes/GNOME3/{gtk-2.0 => gtk-3.0}/Makefile.am     |    0
 themes/GNOME3/{gtk-2.0 => gtk-3.0}/gtkrc           |    0
 themes/Industrial/Makefile.am                      |    2 +-
 themes/Industrial/{gtk-2.0 => gtk-3.0}/Makefile.am |    0
 themes/Industrial/{gtk-2.0 => gtk-3.0}/gtkrc       |    0
 themes/Mist/Makefile.am                            |    2 +-
 themes/Mist/{gtk-2.0 => gtk-3.0}/Makefile.am       |    0
 themes/Mist/{gtk-2.0 => gtk-3.0}/gtkrc             |    0
 themes/Redmond/Makefile.am                         |    2 +-
 themes/Redmond/{gtk-2.0 => gtk-3.0}/Makefile.am    |    0
 themes/Redmond/{gtk-2.0 => gtk-3.0}/gtkrc          |    0
 themes/ThinIce/Makefile.am                         |    2 +-
 themes/ThinIce/{gtk-2.0 => gtk-3.0}/Makefile.am    |    0
 themes/ThinIce/{gtk-2.0 => gtk-3.0}/gtkrc          |    0
 31 files changed, 26 insertions(+), 53 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index d15238f..9a3c177 100644
--- a/configure.ac
+++ b/configure.ac
@@ -123,13 +123,13 @@ if test $lua = "yes"; then
 fi
 
 # Don't forget to update the README when changing this.
-PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.12.0,,
-                  AC_MSG_ERROR([GTK+-2.12 is required to compile gtk-engines]))
+PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 2.90.0,,
+                  AC_MSG_ERROR([GTK+-3.0 is required to compile gtk-engines]))
 
 AC_SUBST(GTK_CFLAGS)
 AC_SUBST(GTK_LIBS)
 
-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)
 
 if test $system_lua = "yes"; then
@@ -184,20 +184,20 @@ engines/thinice/Makefile
 engines/lua/Makefile
 themes/Makefile
 themes/Clearlooks/Makefile
-themes/Clearlooks/gtk-2.0/Makefile
+themes/Clearlooks/gtk-3.0/Makefile
 themes/GNOME3/Makefile
-themes/GNOME3/gtk-2.0/Makefile
+themes/GNOME3/gtk-3.0/Makefile
 themes/GNOME3/metacity-1/Makefile
 themes/Crux/Makefile
-themes/Crux/gtk-2.0/Makefile
+themes/Crux/gtk-3.0/Makefile
 themes/Industrial/Makefile
-themes/Industrial/gtk-2.0/Makefile
+themes/Industrial/gtk-3.0/Makefile
 themes/Mist/Makefile
-themes/Mist/gtk-2.0/Makefile
+themes/Mist/gtk-3.0/Makefile
 themes/Redmond/Makefile
-themes/Redmond/gtk-2.0/Makefile
+themes/Redmond/gtk-3.0/Makefile
 themes/ThinIce/Makefile
-themes/ThinIce/gtk-2.0/Makefile
+themes/ThinIce/gtk-3.0/Makefile
 gtk-engines-2.pc
 gtk-engines.spec
 po/Makefile.in
diff --git a/engines/clearlooks/Makefile.am b/engines/clearlooks/Makefile.am
index 187dc41..d325d11 100644
--- a/engines/clearlooks/Makefile.am
+++ b/engines/clearlooks/Makefile.am
@@ -22,7 +22,7 @@
 INCLUDES = -I$(top_srcdir)/engines/support \
            $(GTK_CFLAGS) $(DEVELOPMENT_CFLAGS)
 
-enginedir = $(libdir)/gtk-2.0/$(GTK_VERSION)/engines
+enginedir = $(libdir)/gtk-3.0/$(GTK_VERSION)/engines
 engine_LTLIBRARIES = libclearlooks.la
 
 libclearlooks_la_SOURCES =		\
diff --git a/engines/clearlooks/src/support.c b/engines/clearlooks/src/support.c
index e94584f..21c8197 100644
--- a/engines/clearlooks/src/support.c
+++ b/engines/clearlooks/src/support.c
@@ -46,26 +46,6 @@ void clearlooks_treeview_get_header_index (GtkTreeView *tv, GtkWidget *header,
 	g_list_free (list_start);
 }
 
-#ifndef GTK_DISABLE_DEPRECATED
-void clearlooks_clist_get_header_index (GtkCList *clist, GtkWidget *button,
-                                 gint *column_index, gint *columns)
-{
-	int i;
-	*columns = clist->columns;
-	
-	for (i=0; i<*columns; i++)
-	{
-		if (clist->column[i].button == button)
-		{
-			*column_index = i;
-			break;
-		}
-	}
-}
-#else
-#warning Disabling special CList support of clearlooks as GTK_DISABLE_DEPRECATED is enabled.
-#endif
-
 void
 clearlooks_get_parent_bg (const GtkWidget *widget, CairoColor *color)
 {
diff --git a/engines/clearlooks/src/support.h b/engines/clearlooks/src/support.h
index d820040..0bddf6c 100644
--- a/engines/clearlooks/src/support.h
+++ b/engines/clearlooks/src/support.h
@@ -39,13 +39,6 @@ GE_INTERNAL void              clearlooks_treeview_get_header_index (GtkTreeView
                                                  gint         *columns,
                                                  gboolean     *resizable);
 
-#ifndef GTK_DISABLE_DEPRECATED
-GE_INTERNAL void              clearlooks_clist_get_header_index    (GtkCList     *clist,
-                                                 GtkWidget    *button,
-                                                 gint         *column_index,
-                                                 gint         *columns);
-#endif
-
 #ifdef DEVELOPMENT
 #warning clearlooks_get_parent_bg is a bad hack - find out why its needed, and figure out a better way.
 #endif
diff --git a/engines/crux/Makefile.am b/engines/crux/Makefile.am
index 6a23ced..a78bff7 100644
--- a/engines/crux/Makefile.am
+++ b/engines/crux/Makefile.am
@@ -1,7 +1,7 @@
 INCLUDES = -I$(top_srcdir)/engines/support \
            $(GTK_CFLAGS) $(DEVELOPMENT_CFLAGS)
 
-enginedir = $(libdir)/gtk-2.0/$(GTK_VERSION)/engines
+enginedir = $(libdir)/gtk-3.0/$(GTK_VERSION)/engines
 
 engine_LTLIBRARIES = libcrux-engine.la
 
diff --git a/engines/glide/Makefile.am b/engines/glide/Makefile.am
index 3255c8e..8bd863e 100644
--- a/engines/glide/Makefile.am
+++ b/engines/glide/Makefile.am
@@ -21,7 +21,7 @@
 INCLUDES = -I$(top_srcdir)/engines/support \
            $(GTK_CFLAGS)  $(DEVELOPMENT_CFLAGS)
 
-enginedir = $(libdir)/gtk-2.0/$(GTK_VERSION)/engines
+enginedir = $(libdir)/gtk-3.0/$(GTK_VERSION)/engines
 
 engine_LTLIBRARIES = libglide.la
 
diff --git a/engines/hc/Makefile.am b/engines/hc/Makefile.am
index 61528e3..572c15c 100644
--- a/engines/hc/Makefile.am
+++ b/engines/hc/Makefile.am
@@ -22,7 +22,7 @@
 INCLUDES = -I$(top_srcdir)/engines/support \
            $(GTK_CFLAGS) $(DEVELOPMENT_CFLAGS)
 
-enginedir = $(libdir)/gtk-2.0/$(GTK_VERSION)/engines
+enginedir = $(libdir)/gtk-3.0/$(GTK_VERSION)/engines
 
 engine_LTLIBRARIES = libhcengine.la
 
diff --git a/engines/industrial/Makefile.am b/engines/industrial/Makefile.am
index 5cbe990..059068a 100644
--- a/engines/industrial/Makefile.am
+++ b/engines/industrial/Makefile.am
@@ -23,7 +23,7 @@
 INCLUDES = -I$(top_srcdir)/engines/support \
            $(GTK_CFLAGS) $(DEVELOPMENT_CFLAGS)
 
-enginedir = $(libdir)/gtk-2.0/$(GTK_VERSION)/engines
+enginedir = $(libdir)/gtk-3.0/$(GTK_VERSION)/engines
 
 engine_LTLIBRARIES = libindustrial.la
 
diff --git a/engines/lua/Makefile.am b/engines/lua/Makefile.am
index 73cf4ee..5d2227d 100644
--- a/engines/lua/Makefile.am
+++ b/engines/lua/Makefile.am
@@ -90,7 +90,7 @@ INCLUDES = \
 	$(LIBLUA_CFLAGS) $(GTK_CFLAGS) $(DEVELOPMENT_CFLAGS) \
 	$(NULL)
 
-enginedir = $(libdir)/gtk-2.0/$(GTK_VERSION)/engines
+enginedir = $(libdir)/gtk-3.0/$(GTK_VERSION)/engines
 engine_LTLIBRARIES = libluaengine.la
 
 libluaengine_la_SOURCES = \
diff --git a/engines/mist/Makefile.am b/engines/mist/Makefile.am
index 439f6d2..945622b 100644
--- a/engines/mist/Makefile.am
+++ b/engines/mist/Makefile.am
@@ -1,7 +1,7 @@
 INCLUDES = -I$(top_srcdir)/engines/support \
            $(GTK_CFLAGS) $(DEVELOPMENT_CFLAGS)
 
-enginedir = $(libdir)/gtk-2.0/$(GTK_VERSION)/engines
+enginedir = $(libdir)/gtk-3.0/$(GTK_VERSION)/engines
 
 engine_LTLIBRARIES = libmist.la
 
diff --git a/engines/redmond/Makefile.am b/engines/redmond/Makefile.am
index a9a58d4..945c910 100644
--- a/engines/redmond/Makefile.am
+++ b/engines/redmond/Makefile.am
@@ -24,7 +24,7 @@ INCLUDES = -I$(top_srcdir)/engines/support \
            $(GTK_CFLAGS) $(DEVELOPMENT_CFLAGS)
 
 
-enginedir = $(libdir)/gtk-2.0/$(GTK_VERSION)/engines
+enginedir = $(libdir)/gtk-3.0/$(GTK_VERSION)/engines
 
 engine_LTLIBRARIES = libredmond95.la
 
diff --git a/engines/thinice/Makefile.am b/engines/thinice/Makefile.am
index 57a3797..f0f5d0d 100644
--- a/engines/thinice/Makefile.am
+++ b/engines/thinice/Makefile.am
@@ -1,7 +1,7 @@
 INCLUDES = -I$(top_srcdir)/engines/support \
            $(GTK_CFLAGS) $(DEVELOPMENT_CFLAGS)
 
-enginedir = $(libdir)/gtk-2.0/$(GTK_VERSION)/engines
+enginedir = $(libdir)/gtk-3.0/$(GTK_VERSION)/engines
 
 engine_LTLIBRARIES = libthinice.la
 
diff --git a/themes/Clearlooks/Makefile.am b/themes/Clearlooks/Makefile.am
index eef74bf..0143708 100644
--- a/themes/Clearlooks/Makefile.am
+++ b/themes/Clearlooks/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = gtk-2.0
+SUBDIRS = gtk-3.0
 
 -include $(top_srcdir)/git.mk
 
diff --git a/themes/Crux/Makefile.am b/themes/Crux/Makefile.am
index eef74bf..0143708 100644
--- a/themes/Crux/Makefile.am
+++ b/themes/Crux/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = gtk-2.0
+SUBDIRS = gtk-3.0
 
 -include $(top_srcdir)/git.mk
 
diff --git a/themes/Crux/gtk-2.0/Makefile.am b/themes/Crux/gtk-3.0/Makefile.am
similarity index 100%
rename from themes/Crux/gtk-2.0/Makefile.am
rename to themes/Crux/gtk-3.0/Makefile.am
diff --git a/themes/Crux/gtk-2.0/gtkrc b/themes/Crux/gtk-3.0/gtkrc
similarity index 100%
rename from themes/Crux/gtk-2.0/gtkrc
rename to themes/Crux/gtk-3.0/gtkrc
diff --git a/themes/GNOME3/Makefile.am b/themes/GNOME3/Makefile.am
index 9e9eb7e..f7a8633 100644
--- a/themes/GNOME3/Makefile.am
+++ b/themes/GNOME3/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = gtk-2.0 metacity-1
+SUBDIRS = gtk-3.0 metacity-1
 
 -include $(top_srcdir)/git.mk
 
diff --git a/themes/GNOME3/gtk-2.0/Makefile.am b/themes/GNOME3/gtk-3.0/Makefile.am
similarity index 100%
rename from themes/GNOME3/gtk-2.0/Makefile.am
rename to themes/GNOME3/gtk-3.0/Makefile.am
diff --git a/themes/GNOME3/gtk-2.0/gtkrc b/themes/GNOME3/gtk-3.0/gtkrc
similarity index 100%
rename from themes/GNOME3/gtk-2.0/gtkrc
rename to themes/GNOME3/gtk-3.0/gtkrc
diff --git a/themes/Industrial/Makefile.am b/themes/Industrial/Makefile.am
index eef74bf..0143708 100644
--- a/themes/Industrial/Makefile.am
+++ b/themes/Industrial/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = gtk-2.0
+SUBDIRS = gtk-3.0
 
 -include $(top_srcdir)/git.mk
 
diff --git a/themes/Industrial/gtk-2.0/Makefile.am b/themes/Industrial/gtk-3.0/Makefile.am
similarity index 100%
rename from themes/Industrial/gtk-2.0/Makefile.am
rename to themes/Industrial/gtk-3.0/Makefile.am
diff --git a/themes/Industrial/gtk-2.0/gtkrc b/themes/Industrial/gtk-3.0/gtkrc
similarity index 100%
rename from themes/Industrial/gtk-2.0/gtkrc
rename to themes/Industrial/gtk-3.0/gtkrc
diff --git a/themes/Mist/Makefile.am b/themes/Mist/Makefile.am
index eef74bf..0143708 100644
--- a/themes/Mist/Makefile.am
+++ b/themes/Mist/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = gtk-2.0
+SUBDIRS = gtk-3.0
 
 -include $(top_srcdir)/git.mk
 
diff --git a/themes/Mist/gtk-2.0/Makefile.am b/themes/Mist/gtk-3.0/Makefile.am
similarity index 100%
rename from themes/Mist/gtk-2.0/Makefile.am
rename to themes/Mist/gtk-3.0/Makefile.am
diff --git a/themes/Mist/gtk-2.0/gtkrc b/themes/Mist/gtk-3.0/gtkrc
similarity index 100%
rename from themes/Mist/gtk-2.0/gtkrc
rename to themes/Mist/gtk-3.0/gtkrc
diff --git a/themes/Redmond/Makefile.am b/themes/Redmond/Makefile.am
index eef74bf..0143708 100644
--- a/themes/Redmond/Makefile.am
+++ b/themes/Redmond/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = gtk-2.0
+SUBDIRS = gtk-3.0
 
 -include $(top_srcdir)/git.mk
 
diff --git a/themes/Redmond/gtk-2.0/Makefile.am b/themes/Redmond/gtk-3.0/Makefile.am
similarity index 100%
rename from themes/Redmond/gtk-2.0/Makefile.am
rename to themes/Redmond/gtk-3.0/Makefile.am
diff --git a/themes/Redmond/gtk-2.0/gtkrc b/themes/Redmond/gtk-3.0/gtkrc
similarity index 100%
rename from themes/Redmond/gtk-2.0/gtkrc
rename to themes/Redmond/gtk-3.0/gtkrc
diff --git a/themes/ThinIce/Makefile.am b/themes/ThinIce/Makefile.am
index eef74bf..0143708 100644
--- a/themes/ThinIce/Makefile.am
+++ b/themes/ThinIce/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = gtk-2.0
+SUBDIRS = gtk-3.0
 
 -include $(top_srcdir)/git.mk
 
diff --git a/themes/ThinIce/gtk-2.0/Makefile.am b/themes/ThinIce/gtk-3.0/Makefile.am
similarity index 100%
rename from themes/ThinIce/gtk-2.0/Makefile.am
rename to themes/ThinIce/gtk-3.0/Makefile.am
diff --git a/themes/ThinIce/gtk-2.0/gtkrc b/themes/ThinIce/gtk-3.0/gtkrc
similarity index 100%
rename from themes/ThinIce/gtk-2.0/gtkrc
rename to themes/ThinIce/gtk-3.0/gtkrc
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]