Merge lp:~bkerensa/ubuntu/raring/gnome-themes-standard/new-upstream into lp:ubuntu/raring/gnome-themes-standard

Proposed by Benjamin Kerensa
Status: Merged
Merged at revision: 52
Proposed branch: lp:~bkerensa/ubuntu/raring/gnome-themes-standard/new-upstream
Merge into: lp:ubuntu/raring/gnome-themes-standard
Diff against target: 9862 lines (+5823/-1883)
63 files modified
.pc/01_gtk-update-icon-cache_name.patch/configure.ac (+0/-89)
.pc/applied-patches (+0/-3)
.pc/revert-a11y-theme-drop.patch/configure.ac (+0/-89)
.pc/revert-a11y-theme-drop.patch/themes/Makefile.am (+0/-3)
.pc/ubuntu_a11y_fallback.patch/themes/HighContrast/icons/index.theme.in (+0/-7)
ChangeLog (+724/-2)
Makefile.am (+1/-1)
Makefile.in (+19/-4)
NEWS (+33/-0)
aclocal.m4 (+62/-0)
configure (+249/-72)
configure.ac (+35/-36)
debian/changelog (+6/-0)
src/Makefile.am (+0/-24)
src/Makefile.in (+0/-632)
src/adwaita_engine.c (+0/-458)
src/adwaita_utils.c (+0/-119)
src/adwaita_utils.h (+0/-49)
src/engine.symbols (+0/-3)
themes/Adwaita/Makefile.am (+6/-2)
themes/Adwaita/Makefile.in (+23/-6)
themes/Adwaita/backgrounds/Makefile.in (+18/-3)
themes/Adwaita/cursors/Makefile.in (+18/-3)
themes/Adwaita/gtk-2.0/Makefile.am (+14/-4)
themes/Adwaita/gtk-2.0/Makefile.in (+243/-40)
themes/Adwaita/gtk-2.0/adwaita_engine.c (+211/-0)
themes/Adwaita/gtk-2.0/gtkrc (+24/-16)
themes/Adwaita/gtk-3.0/Makefile.am (+13/-0)
themes/Adwaita/gtk-3.0/Makefile.in (+189/-39)
themes/Adwaita/gtk-3.0/adwaita_engine.c (+536/-0)
themes/Adwaita/gtk-3.0/adwaita_utils.c (+119/-0)
themes/Adwaita/gtk-3.0/adwaita_utils.h (+49/-0)
themes/Adwaita/gtk-3.0/assets/Makefile.in (+18/-3)
themes/Adwaita/gtk-3.0/borders/Makefile.am (+4/-0)
themes/Adwaita/gtk-3.0/borders/Makefile.in (+22/-3)
themes/Adwaita/gtk-3.0/gnome-applications.css (+178/-7)
themes/Adwaita/gtk-3.0/gtk-fallback.css (+15/-0)
themes/Adwaita/gtk-3.0/gtk-main-common.css (+1/-1)
themes/Adwaita/gtk-3.0/gtk-main.css (+0/-1)
themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css (+16/-2)
themes/Adwaita/gtk-3.0/gtk-widgets-borders-dark.css (+23/-2)
themes/Adwaita/gtk-3.0/gtk-widgets-borders.css (+23/-2)
themes/Adwaita/gtk-3.0/gtk-widgets-dark-overrides.css (+5/-3)
themes/Adwaita/gtk-3.0/gtk-widgets.css (+245/-75)
themes/Adwaita/gtk-3.0/gtk.gresource.xml (+5/-0)
themes/Adwaita/metacity-1/Makefile.in (+18/-3)
themes/Adwaita/metacity-1/metacity-theme-3.xml (+15/-14)
themes/HighContrast/Makefile.am (+4/-3)
themes/HighContrast/Makefile.in (+71/-42)
themes/HighContrast/gtk-2.0/Makefile.in (+18/-3)
themes/HighContrast/gtk-3.0/Makefile.in (+18/-3)
themes/HighContrast/gtk-3.0/gtk-widgets.css (+20/-1)
themes/HighContrast/gtk-3.0/gtk.css (+10/-0)
themes/HighContrast/icons/Makefile.in (+18/-3)
themes/HighContrast/icons/index.theme (+31/-1)
themes/HighContrast/icons/index.theme.in (+1/-1)
themes/HighContrast/index.theme (+1/-1)
themes/HighContrast/index.theme.in (+1/-1)
themes/HighContrast/metacity-1/Makefile.am (+7/-0)
themes/HighContrast/metacity-1/Makefile.in (+499/-0)
themes/HighContrast/metacity-1/metacity-theme-3.xml (+1925/-0)
themes/Makefile.am (+1/-1)
themes/Makefile.in (+18/-3)
To merge this branch: bzr merge lp:~bkerensa/ubuntu/raring/gnome-themes-standard/new-upstream
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+135563@code.launchpad.net

Description of the change

New Upstream Release

To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

Thanks, see https://bugs.launchpad.net/ubuntu/+source/gnome-themes-standard/+bug/1067207 as well, it was blocking on g-c-c 3.6 to be uploaded which happened

Revision history for this message
Jeremy BĂ­cha (jbicha) wrote :

The merge proposal was for 3.7.2 but we're sticking with GNOME 3.6 for now. It also needed a build-depends on GTK2. Anyway, I uploaded the new version.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== removed directory '.pc/01_gtk-update-icon-cache_name.patch'
2=== removed file '.pc/01_gtk-update-icon-cache_name.patch/configure.ac'
3--- .pc/01_gtk-update-icon-cache_name.patch/configure.ac 2012-10-02 00:58:28 +0000
4+++ .pc/01_gtk-update-icon-cache_name.patch/configure.ac 1970-01-01 00:00:00 +0000
5@@ -1,89 +0,0 @@
6-dnl Process this file with autoconf to produce a configure script.
7-AC_PREREQ(2.53)
8-
9-AC_INIT([gnome-themes-standard], [3.6.0.2],
10- [http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-themes-standard])
11-
12-AM_INIT_AUTOMAKE([1.9 tar-ustar foreign dist-xz no-dist-gzip])
13-
14-PKG_PROG_PKG_CONFIG([0.19])
15-
16-AC_PROG_SED
17-AC_PROG_CC
18-AC_PROG_INSTALL
19-AC_PROG_MAKE_SET
20-AM_PROG_CC_C_O
21-AM_PATH_GLIB_2_0
22-
23-dnl Initialize libtool
24-AM_DISABLE_STATIC
25-AC_LIBTOOL_WIN32_DLL
26-AM_PROG_LIBTOOL
27-
28-dnl Initialize intltool
29-IT_PROG_INTLTOOL([0.40.0])
30-
31-GETTEXT_PACKAGE="${PACKAGE}"
32-AC_SUBST(GETTEXT_PACKAGE)
33-AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package])
34-AM_GLIB_GNU_GETTEXT
35-
36-AC_ARG_ENABLE([gtk3-engines],
37- AC_HELP_STRING([--disable-gtk3-engines],
38- [Disable Gtk+ 3.x engines [default=no]]),
39- enable_gtk3=$enableval,
40- enable_gtk3=yes)
41-AC_MSG_CHECKING([building gtk3 engines])
42-AM_CONDITIONAL(GTK3, test "x$enable_gtk3" = "xyes")
43-AC_MSG_RESULT([$enable_gtk3])
44-GTK_VERSION_REQUIRED=3.5.17
45-
46-if test "x$enable_gtk3" = "xyes"; then
47- PKG_CHECK_MODULES([DEPENDENCIES], [gtk+-3.0 >= $GTK_VERSION_REQUIRED librsvg-2.0])
48- PKG_CHECK_MODULES([HIGHCONTRAST], [cairo gio-2.0 gdk-pixbuf-2.0 gdk-3.0])
49-fi
50-AC_SUBST(DEPENDENCIES_CFLAGS)
51-AC_SUBST(DEPENDENCIES_LIBS)
52-
53-GTK_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-3.0`
54-AC_SUBST(GTK_VERSION)
55-
56-GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable glib_compile_resources gio-2.0`
57-AC_SUBST(GLIB_COMPILE_RESOURCES)
58-
59-# Configure option to force placeholders
60-AC_ARG_ENABLE([placeholders],
61- AC_HELP_STRING([--enable-placeholders],
62- [Enable placeholder icons [default=no]]),
63- enable_placeholders=$enableval,
64- enable_placeholders=no)
65-AM_CONDITIONAL(PLACEHOLDERS, test "x$enable_placeholders" != "xno")
66-
67-AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, gtk-update-icon-cache)
68-if test -z "$GTK_UPDATE_ICON_CACHE"; then
69- AC_MSG_ERROR([Could not find gtk-update-icon-cache])
70-fi
71-
72-# Workaround to make aclocal get the right flags
73-AC_SUBST(ACLOCAL_AMFLAGS, "\${ACLOCAL_FLAGS}")
74-
75-AC_CONFIG_FILES([
76-Makefile
77-themes/Makefile
78-themes/Adwaita/Makefile
79-themes/Adwaita/backgrounds/Makefile
80-themes/Adwaita/cursors/Makefile
81-themes/Adwaita/gtk-2.0/Makefile
82-themes/Adwaita/gtk-3.0/Makefile
83-themes/Adwaita/gtk-3.0/assets/Makefile
84-themes/Adwaita/gtk-3.0/borders/Makefile
85-themes/Adwaita/metacity-1/Makefile
86-themes/HighContrast/Makefile
87-themes/HighContrast/gtk-2.0/Makefile
88-themes/HighContrast/gtk-3.0/Makefile
89-themes/HighContrast/icons/Makefile
90-src/Makefile
91-po/Makefile.in
92-])
93-
94-AC_OUTPUT
95
96=== removed file '.pc/applied-patches'
97--- .pc/applied-patches 2012-10-02 00:58:28 +0000
98+++ .pc/applied-patches 1970-01-01 00:00:00 +0000
99@@ -1,3 +0,0 @@
100-01_gtk-update-icon-cache_name.patch
101-ubuntu_a11y_fallback.patch
102-revert-a11y-theme-drop.patch
103
104=== removed directory '.pc/revert-a11y-theme-drop.patch'
105=== removed file '.pc/revert-a11y-theme-drop.patch/configure.ac'
106--- .pc/revert-a11y-theme-drop.patch/configure.ac 2012-10-02 00:58:28 +0000
107+++ .pc/revert-a11y-theme-drop.patch/configure.ac 1970-01-01 00:00:00 +0000
108@@ -1,89 +0,0 @@
109-dnl Process this file with autoconf to produce a configure script.
110-AC_PREREQ(2.53)
111-
112-AC_INIT([gnome-themes-standard], [3.6.0.2],
113- [http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-themes-standard])
114-
115-AM_INIT_AUTOMAKE([1.9 tar-ustar foreign dist-xz no-dist-gzip])
116-
117-PKG_PROG_PKG_CONFIG([0.19])
118-
119-AC_PROG_SED
120-AC_PROG_CC
121-AC_PROG_INSTALL
122-AC_PROG_MAKE_SET
123-AM_PROG_CC_C_O
124-AM_PATH_GLIB_2_0
125-
126-dnl Initialize libtool
127-AM_DISABLE_STATIC
128-AC_LIBTOOL_WIN32_DLL
129-AM_PROG_LIBTOOL
130-
131-dnl Initialize intltool
132-IT_PROG_INTLTOOL([0.40.0])
133-
134-GETTEXT_PACKAGE="${PACKAGE}"
135-AC_SUBST(GETTEXT_PACKAGE)
136-AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package])
137-AM_GLIB_GNU_GETTEXT
138-
139-AC_ARG_ENABLE([gtk3-engines],
140- AC_HELP_STRING([--disable-gtk3-engines],
141- [Disable Gtk+ 3.x engines [default=no]]),
142- enable_gtk3=$enableval,
143- enable_gtk3=yes)
144-AC_MSG_CHECKING([building gtk3 engines])
145-AM_CONDITIONAL(GTK3, test "x$enable_gtk3" = "xyes")
146-AC_MSG_RESULT([$enable_gtk3])
147-GTK_VERSION_REQUIRED=3.5.17
148-
149-if test "x$enable_gtk3" = "xyes"; then
150- PKG_CHECK_MODULES([DEPENDENCIES], [gtk+-3.0 >= $GTK_VERSION_REQUIRED librsvg-2.0])
151- PKG_CHECK_MODULES([HIGHCONTRAST], [cairo gio-2.0 gdk-pixbuf-2.0 gdk-3.0])
152-fi
153-AC_SUBST(DEPENDENCIES_CFLAGS)
154-AC_SUBST(DEPENDENCIES_LIBS)
155-
156-GTK_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-3.0`
157-AC_SUBST(GTK_VERSION)
158-
159-GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable glib_compile_resources gio-2.0`
160-AC_SUBST(GLIB_COMPILE_RESOURCES)
161-
162-# Configure option to force placeholders
163-AC_ARG_ENABLE([placeholders],
164- AC_HELP_STRING([--enable-placeholders],
165- [Enable placeholder icons [default=no]]),
166- enable_placeholders=$enableval,
167- enable_placeholders=no)
168-AM_CONDITIONAL(PLACEHOLDERS, test "x$enable_placeholders" != "xno")
169-
170-AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, gtk-update-icon-cache-3.0)
171-if test -z "$GTK_UPDATE_ICON_CACHE"; then
172- AC_MSG_ERROR([Could not find gtk-update-icon-cache-3.0])
173-fi
174-
175-# Workaround to make aclocal get the right flags
176-AC_SUBST(ACLOCAL_AMFLAGS, "\${ACLOCAL_FLAGS}")
177-
178-AC_CONFIG_FILES([
179-Makefile
180-themes/Makefile
181-themes/Adwaita/Makefile
182-themes/Adwaita/backgrounds/Makefile
183-themes/Adwaita/cursors/Makefile
184-themes/Adwaita/gtk-2.0/Makefile
185-themes/Adwaita/gtk-3.0/Makefile
186-themes/Adwaita/gtk-3.0/assets/Makefile
187-themes/Adwaita/gtk-3.0/borders/Makefile
188-themes/Adwaita/metacity-1/Makefile
189-themes/HighContrast/Makefile
190-themes/HighContrast/gtk-2.0/Makefile
191-themes/HighContrast/gtk-3.0/Makefile
192-themes/HighContrast/icons/Makefile
193-src/Makefile
194-po/Makefile.in
195-])
196-
197-AC_OUTPUT
198
199=== removed directory '.pc/revert-a11y-theme-drop.patch/themes'
200=== removed file '.pc/revert-a11y-theme-drop.patch/themes/Makefile.am'
201--- .pc/revert-a11y-theme-drop.patch/themes/Makefile.am 2012-10-02 00:58:28 +0000
202+++ .pc/revert-a11y-theme-drop.patch/themes/Makefile.am 1970-01-01 00:00:00 +0000
203@@ -1,3 +0,0 @@
204-SUBDIRS = Adwaita HighContrast
205-
206--include $(top_srcdir)/git.mk
207
208=== removed directory '.pc/ubuntu_a11y_fallback.patch'
209=== removed directory '.pc/ubuntu_a11y_fallback.patch/themes'
210=== removed directory '.pc/ubuntu_a11y_fallback.patch/themes/HighContrast'
211=== removed directory '.pc/ubuntu_a11y_fallback.patch/themes/HighContrast/icons'
212=== removed file '.pc/ubuntu_a11y_fallback.patch/themes/HighContrast/icons/index.theme.in'
213--- .pc/ubuntu_a11y_fallback.patch/themes/HighContrast/icons/index.theme.in 2012-07-02 15:06:16 +0000
214+++ .pc/ubuntu_a11y_fallback.patch/themes/HighContrast/icons/index.theme.in 1970-01-01 00:00:00 +0000
215@@ -1,7 +0,0 @@
216-[Icon Theme]
217-Name=HighContrast
218-Comment=High contrast scalable icons with black borders
219-Inherits=gnome
220-Example=folder
221-
222-Directories=@THEME_DIRS@
223
224=== modified file 'ChangeLog'
225--- ChangeLog 2012-10-02 00:58:28 +0000
226+++ ChangeLog 2012-11-22 00:35:57 +0000
227@@ -1,6 +1,728 @@
228 # Generated by Makefile. Do not edit.
229
230-commit 7bf573f542f329e2fbd6fade57e62843d60787e3 (HEAD, master)
231+commit 1aed68dbda8b93b39d2586df132cc14ca337c4d9 (HEAD, origin/master, origin/HEAD, master)
232+Author: Benjamin Otte <otte@redhat.com>
233+Date: Thu Nov 15 19:38:46 2012 +0100
234+
235+ adwaita: Don't spew errors without resource
236+
237+ If the resource doesn't exist, it usually means people are hacking the
238+ theme with a custom @import from the home directory.
239+
240+ themes/Adwaita/gtk-3.0/adwaita_engine.c | 10 +++++++---
241+ 1 file changed, 7 insertions(+), 3 deletions(-)
242+
243+commit 370b38ad0954c657077bf9dee67b6a036cd65d26
244+Author: Benjamin Otte <otte@redhat.com>
245+Date: Thu Nov 15 19:09:18 2012 +0100
246+
247+ HighContrast: Style .background, not GtkWindow
248+
249+ We want to be able to simulate a regular window background by just
250+ setting the background style class.
251+
252+ themes/HighContrast/gtk-3.0/gtk-widgets.css | 2 +-
253+ 1 file changed, 1 insertion(+), 1 deletion(-)
254+
255+commit 127d02f515dc5daa4e0af967c85030415dbf95e6
256+Author: Benjamin Otte <otte@redhat.com>
257+Date: Thu Nov 15 19:07:28 2012 +0100
258+
259+ adwaita: Style .background, not GtkWindow
260+
261+ We want to be able to simulate a regular window background by just
262+ setting the background style class.
263+
264+ themes/Adwaita/gtk-3.0/gtk-widgets.css | 8 ++++----
265+ 1 file changed, 4 insertions(+), 4 deletions(-)
266+
267+commit 36b80f8c3f017ea7e30bbf3724e68b5dab59b7d8
268+Author: Cosimo Cecchi <cosimoc@gnome.org>
269+Date: Fri Nov 2 14:46:50 2012 -0400
270+
271+ menu: ensure insensitive menu items get the right background
272+
273+ For some reason GTK+ master exposes a new bug in the menu theming code;
274+ we forgot to ensure the insensitive state of the menu has the correct
275+ background color.
276+
277+ themes/Adwaita/gtk-3.0/gtk-widgets.css | 4 ++++
278+ 1 file changed, 4 insertions(+)
279+
280+commit 8d82049f00b0daad5f51e64f23b21dba143ef1a1
281+Author: Cosimo Cecchi <cosimoc@gnome.org>
282+Date: Fri Nov 2 13:32:16 2012 -0400
283+
284+ separators: ensure separators have a transparent background
285+
286+ themes/Adwaita/gtk-3.0/gtk-widgets.css | 1 +
287+ 1 file changed, 1 insertion(+)
288+
289+commit c68975573142843e10c2be94a826db8b2f2b932f
290+Author: Benjamin Otte <otte@redhat.com>
291+Date: Thu Nov 1 12:47:27 2012 +0100
292+
293+ Adwaita: Fix active spinner without animations
294+
295+ https://bugzilla.gnome.org/show_bug.cgi?id=686021
296+
297+ themes/Adwaita/gtk-3.0/gtk-widgets.css | 8 ++++++++
298+ 1 file changed, 8 insertions(+)
299+
300+commit b81d42b7e0c5d7638c25f59bdb8685db7dd5adce
301+Author: Lapo Calamandrei <calamandrei@gmail.com>
302+Date: Mon Oct 29 11:04:31 2012 +0100
303+
304+ adwaita gtk3: first stab at toolbars padding tweak.
305+
306+ themes/Adwaita/gtk-3.0/gnome-applications.css | 4 ++--
307+ themes/Adwaita/gtk-3.0/gtk-widgets.css | 11 +++++++----
308+ 2 files changed, 9 insertions(+), 6 deletions(-)
309+
310+commit 6a2b6f570ce47e3dc6b6a432b3292449aa1534f6
311+Author: Lapo Calamandrei <calamandrei@gmail.com>
312+Date: Mon Oct 29 10:45:00 2012 +0100
313+
314+ adwaita gtk3: added box-shadow to inline toolbars (like we did for primary toolbars).
315+
316+ themes/Adwaita/gtk-3.0/gtk-widgets.css | 2 ++
317+ 1 file changed, 2 insertions(+)
318+
319+commit b7333b92a2ab7fc6d4483aae0387304fc9df7534
320+Author: Lapo Calamandrei <calamandrei@gmail.com>
321+Date: Fri Oct 19 17:50:14 2012 +0200
322+
323+ adwaita wm: properly remove left border from right tile.
324+
325+ themes/Adwaita/metacity-1/metacity-theme-3.xml | 10 +++++-----
326+ 1 file changed, 5 insertions(+), 5 deletions(-)
327+
328+commit fe237eb4f2f934a5b148ad3edf35b4590923a5c0
329+Author: Lapo Calamandrei <calamandrei@gmail.com>
330+Date: Mon Oct 15 15:07:51 2012 +0200
331+
332+ adwaita gtk3: increase padding on tabs close button to make it a square once
333+ again, after the tab changes in the adwaita engine.
334+
335+ themes/Adwaita/gtk-3.0/gtk-widgets.css | 2 +-
336+ 1 file changed, 1 insertion(+), 1 deletion(-)
337+
338+commit b1a067033ae7f14832c3346f261a09edcd637cfb
339+Author: Cosimo Cecchi <cosimoc@gnome.org>
340+Date: Wed Oct 17 14:02:52 2012 -0400
341+
342+ build: fix the build for non-X11 environments
343+
344+ https://bugzilla.gnome.org/show_bug.cgi?id=686305
345+
346+ configure.ac | 2 +-
347+ themes/Adwaita/gtk-2.0/adwaita_engine.c | 7 +++++++
348+ themes/Adwaita/gtk-3.0/adwaita_engine.c | 16 ++++++++++++----
349+ 3 files changed, 20 insertions(+), 5 deletions(-)
350+
351+commit f9b39e206a25da630506aa160d6a66d236b07616
352+Author: Cosimo Cecchi <cosimoc@gnome.org>
353+Date: Wed Oct 17 11:57:21 2012 -0400
354+
355+ gtk2: add assets for insensitive variants of check and radio buttons
356+
357+ https://bugzilla.redhat.com/show_bug.cgi?id=856194
358+
359+ themes/Adwaita/gtk-2.0/Check-Radio/check1.png | Bin 3047 -> 0 bytes
360+ themes/Adwaita/gtk-2.0/Check-Radio/check2.png | Bin 3400 -> 0 bytes
361+ .../Check-Radio/checkbox-checked-insensitive.png | Bin 0 -> 3299 bytes
362+ .../gtk-2.0/Check-Radio/checkbox-checked.png | Bin 0 -> 3400 bytes
363+ .../Check-Radio/checkbox-unchecked-insensitive.png | Bin 0 -> 3019 bytes
364+ .../gtk-2.0/Check-Radio/checkbox-unchecked.png | Bin 0 -> 3047 bytes
365+ .../Check-Radio/option-checked-insensitive.png | Bin 0 -> 728 bytes
366+ .../Adwaita/gtk-2.0/Check-Radio/option-checked.png | Bin 0 -> 868 bytes
367+ .../Check-Radio/option-unchecked-insensitive.png | Bin 0 -> 620 bytes
368+ .../gtk-2.0/Check-Radio/option-unchecked.png | Bin 0 -> 673 bytes
369+ themes/Adwaita/gtk-2.0/Check-Radio/option1.png | Bin 673 -> 0 bytes
370+ themes/Adwaita/gtk-2.0/Check-Radio/option2.png | Bin 868 -> 0 bytes
371+ themes/Adwaita/gtk-2.0/Makefile.am | 12 +++++---
372+ themes/Adwaita/gtk-2.0/gtkrc | 32 ++++++++++-----------
373+ 14 files changed, 24 insertions(+), 20 deletions(-)
374+
375+commit e75797b2073deebfa900958c793cae04dc5e4cc1
376+Author: Stefano Facchini <stefano.facchini@gmail.com>
377+Date: Wed Oct 17 00:26:33 2012 +0200
378+
379+ adwaita gtk3: Add style for baobab level cell
380+
381+ themes/Adwaita/gtk-3.0/gnome-applications.css | 23 +++++++++++++++++++++++
382+ 1 file changed, 23 insertions(+)
383+
384+commit 6d0ae688a38faca2e54678c616c892f5ab4da646
385+Author: Cosimo Cecchi <cosimoc@gnome.org>
386+Date: Mon Oct 15 17:51:55 2012 -0400
387+
388+ build: post-branch version bump
389+
390+ The master branch is now open for 3.8 work.
391+
392+ configure.ac | 2 +-
393+ 1 file changed, 1 insertion(+), 1 deletion(-)
394+
395+commit 6bcecae4f65f2577e89b4766d17b5d977f093432
396+Author: Cosimo Cecchi <cosimoc@gnome.org>
397+Date: Mon Oct 15 17:50:29 2012 -0400
398+
399+ build: simplify and modernize build system
400+
401+ Make the GTK2/GTK3 checks more consistent and simplify directory
402+ structure.
403+
404+ Makefile.am | 2 +-
405+ configure.ac | 29 +-
406+ src/Makefile.am | 24 --
407+ src/adwaita_engine.c | 524 --------------------------------
408+ src/adwaita_utils.c | 119 --------
409+ src/adwaita_utils.h | 49 ---
410+ src/engine.symbols | 3 -
411+ themes/Adwaita/Makefile.am | 8 +-
412+ themes/Adwaita/gtk-2.0/Makefile.am | 2 -
413+ themes/Adwaita/gtk-3.0/Makefile.am | 12 +
414+ themes/Adwaita/gtk-3.0/adwaita_engine.c | 524 ++++++++++++++++++++++++++++++++
415+ themes/Adwaita/gtk-3.0/adwaita_utils.c | 119 ++++++++
416+ themes/Adwaita/gtk-3.0/adwaita_utils.h | 49 +++
417+ themes/HighContrast/Makefile.am | 5 +-
418+ 14 files changed, 727 insertions(+), 742 deletions(-)
419+
420+commit 83b67839066a4934e3e5b0e1f81ff1074a444bad (tag: 3.6.1)
421+Author: Cosimo Cecchi <cosimoc@gnome.org>
422+Date: Mon Oct 15 17:26:44 2012 -0400
423+
424+ release: prepare for 3.6.1
425+
426+ NEWS | 14 ++++++++++++++
427+ configure.ac | 2 +-
428+ 2 files changed, 15 insertions(+), 1 deletion(-)
429+
430+commit c7148fc46524d6cfe9416a3c72821db95f432955
431+Author: Cosimo Cecchi <cosimoc@gnome.org>
432+Date: Mon Oct 15 17:33:07 2012 -0400
433+
434+ build: enable silent rules
435+
436+ configure.ac | 1 +
437+ 1 file changed, 1 insertion(+)
438+
439+commit 13a03579929dcafd9c6a97285cbb11e6ae746c01
440+Author: Lapo Calamandrei <calamandrei@gmail.com>
441+Date: Mon Oct 15 12:27:46 2012 +0200
442+
443+ adwaita gtk3: fix toolbar buttons insensitive backdrop background color.
444+
445+ themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css | 3 ++-
446+ 1 file changed, 2 insertions(+), 1 deletion(-)
447+
448+commit 0ee76826809baef50a3b972f11a8e330eebc52c2
449+Author: Lapo Calamandrei <calamandrei@gmail.com>
450+Date: Mon Oct 15 11:10:46 2012 +0200
451+
452+ adwaita gtk3: remove a FIXME comment since the related bug has been fixed (#686092).
453+
454+ themes/Adwaita/gtk-3.0/gtk-widgets.css | 3 ---
455+ 1 file changed, 3 deletions(-)
456+
457+commit 840daffe51e1c976e3912f716e28c20ff799609e
458+Author: Lapo Calamandrei <calamandrei@gmail.com>
459+Date: Mon Oct 15 10:02:57 2012 +0200
460+
461+ adwaita gtk3: add proper backdrop for inline-toolbars so it gets the right
462+ border color in the dark theme.
463+
464+ themes/Adwaita/gtk-3.0/gtk-widgets.css | 5 +++++
465+ 1 file changed, 5 insertions(+)
466+
467+commit 1e80950b1defa0a4d1f898283128c9d3d4b17f87
468+Author: Lapo Calamandrei <calamandrei@gmail.com>
469+Date: Sun Oct 14 14:26:04 2012 +0200
470+
471+ adwaita gtk3: added a missing brachet from the previous commit...
472+
473+ themes/Adwaita/gtk-3.0/gnome-applications.css | 1 +
474+ 1 file changed, 1 insertion(+)
475+
476+commit feaeb73b6b7ea5e343e6dd229260b3dd7f3dea6b
477+Author: Lapo Calamandrei <calamandrei@gmail.com>
478+Date: Sun Oct 14 14:23:35 2012 +0200
479+
480+ adwaita gtk3: superfluous border removal on baobab treeview frame.
481+
482+ themes/Adwaita/gtk-3.0/gnome-applications.css | 4 ++++
483+ 1 file changed, 4 insertions(+)
484+
485+commit 5d4acd778807a8fc1a08d35202c1b1a11910a129
486+Author: Lapo Calamandrei <calamandrei@gmail.com>
487+Date: Sun Oct 14 13:52:09 2012 +0200
488+
489+ adwaita gtk3: add bottom border to baobab infobars.
490+
491+ themes/Adwaita/gtk-3.0/gnome-applications.css | 7 +++++++
492+ 1 file changed, 7 insertions(+)
493+
494+commit 10c2229b7da6008d00c020342b902bf67c9e09c8
495+Author: Lapo Calamandrei <calamandrei@gmail.com>
496+Date: Sun Oct 14 13:50:52 2012 +0200
497+
498+ adwaita gtk3: selected state styling for .baobab-cell-warning/error.
499+
500+ themes/Adwaita/gtk-3.0/gnome-applications.css | 10 ++++++++--
501+ 1 file changed, 8 insertions(+), 2 deletions(-)
502+
503+commit a889666221dab0f5be90ca7b3f49e1bbf4e6a1aa
504+Author: Lapo Calamandrei <calamandrei@gmail.com>
505+Date: Sun Oct 14 13:05:01 2012 +0200
506+
507+ adwaita gtk3: backdrop state styling for .baobab-cell-warning/error.
508+
509+ themes/Adwaita/gtk-3.0/gnome-applications.css | 6 ++++++
510+ 1 file changed, 6 insertions(+)
511+
512+commit cb899cccf9e4248f3cb49dc45805c43a8eee1714
513+Author: Lapo Calamandrei <calamandrei@gmail.com>
514+Date: Sat Oct 13 18:53:26 2012 +0200
515+
516+ adwaita gtk3: set correct background on raised insensitive toolbar buttons.
517+
518+ themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css | 4 +++-
519+ 1 file changed, 3 insertions(+), 1 deletion(-)
520+
521+commit af878b9da5465ba228bb46db8730c4b0859d32e5
522+Author: Lapo Calamandrei <calamandrei@gmail.com>
523+Date: Sat Oct 13 18:43:05 2012 +0200
524+
525+ Adwaita gtk3: .content-view backdrop fixes.
526+
527+ themes/Adwaita/gtk-3.0/gtk-widgets.css | 17 ++++++++++++-----
528+ 1 file changed, 12 insertions(+), 5 deletions(-)
529+
530+commit e115cb1912e7b19fc091f1e469e1893a900cba6d
531+Author: Stefano Facchini <stefano.facchini@gmail.com>
532+Date: Sat Sep 29 18:32:36 2012 +0200
533+
534+ Add theming for baobab error states
535+
536+ https://bugzilla.gnome.org/show_bug.cgi?id=622473
537+
538+ themes/Adwaita/gtk-3.0/gnome-applications.css | 7 +++++++
539+ 1 file changed, 7 insertions(+)
540+
541+commit 1cad5a780a0b85241c90b25e0a48e5ae5d6eebad
542+Author: Lapo Calamandrei <calamandrei@gmail.com>
543+Date: Sat Oct 13 11:18:54 2012 +0200
544+
545+ Adwaita gtk3: specific (uniform) paddings for GtkColorButton.
546+
547+ themes/Adwaita/gtk-3.0/gtk-widgets.css | 4 ++++
548+ 1 file changed, 4 insertions(+)
549+
550+commit e64048b17a08f47366b382d7b37419454daa9fbc
551+Author: Cosimo Cecchi <cosimoc@gnome.org>
552+Date: Thu Oct 11 10:58:44 2012 -0400
553+
554+ notebook: fix two theming glitches on notebook tabs
555+
556+ The inactive top tab had 1px too much on a gradient color stop, and
557+ left/right active+backdrop tabs had used the wrong background color.
558+
559+ themes/Adwaita/gtk-3.0/gtk-widgets.css | 9 +++++++--
560+ 1 file changed, 7 insertions(+), 2 deletions(-)
561+
562+commit a22a49574b47d7ffdf0a5c4ff1b829b9f7053f52
563+Author: Cosimo Cecchi <cosimoc@gnome.org>
564+Date: Wed Oct 10 17:46:13 2012 -0400
565+
566+ osd: don't use white when GtkMenuButton is used on an OSD toolbar
567+
568+ https://bugzilla.gnome.org/show_bug.cgi?id=685916
569+
570+ themes/Adwaita/gtk-3.0/gtk-widgets.css | 13 ++++++++++++-
571+ 1 file changed, 12 insertions(+), 1 deletion(-)
572+
573+commit a40829eb821ff7bfbc0b3ea8d37cd167f23bcf8c
574+Author: Cosimo Cecchi <cosimoc@gnome.org>
575+Date: Wed Oct 10 13:47:02 2012 -0400
576+
577+ Revert "adwaita gtk2: fix wrong adwaita engine declaration."
578+
579+ It's needed to override menu borders in non-Shell environments.
580+
581+ This reverts commit 99463bfc99c0bb34115fa2e775d460d80cf709d8.
582+
583+ themes/Adwaita/gtk-2.0/gtkrc | 2 +-
584+ 1 file changed, 1 insertion(+), 1 deletion(-)
585+
586+commit be401fff7b5d19735ccd43d32348a84d84ae2404
587+Author: Cosimo Cecchi <cosimoc@gnome.org>
588+Date: Wed Oct 10 13:45:14 2012 -0400
589+
590+ inline-toolbar: add styling for vertical inline toolbars
591+
592+ themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css | 11 ++
593+ .../Adwaita/gtk-3.0/gtk-widgets-borders-dark.css | 12 +-
594+ themes/Adwaita/gtk-3.0/gtk-widgets-borders.css | 12 +-
595+ themes/Adwaita/gtk-3.0/gtk-widgets.css | 127 +++++++++++++++++++--
596+ 4 files changed, 150 insertions(+), 12 deletions(-)
597+
598+commit 14a90d92cf3737b3bb3b5b28152c0c42f84f5730
599+Author: Cosimo Cecchi <cosimoc@gnome.org>
600+Date: Wed Oct 10 13:44:48 2012 -0400
601+
602+ inline-toolbar: fix stray text shadows in backdrop/insensitive states
603+
604+ themes/Adwaita/gtk-3.0/gtk-widgets-dark-overrides.css | 2 ++
605+ 1 file changed, 2 insertions(+)
606+
607+commit f008bff348c22c1c87e45e4b3a5d0758e71b59b3
608+Author: Lapo Calamandrei <calamandrei@gmail.com>
609+Date: Wed Oct 10 19:00:00 2012 +0200
610+
611+ adwaita gtk3: provisionally add style for ephy scrolled window borders
612+ removal.
613+
614+ themes/Adwaita/gtk-3.0/gnome-applications.css | 24 +++++++++++++++++++++++-
615+ 1 file changed, 23 insertions(+), 1 deletion(-)
616+
617+commit 99463bfc99c0bb34115fa2e775d460d80cf709d8
618+Author: Lapo Calamandrei <calamandrei@gmail.com>
619+Date: Wed Oct 10 12:42:29 2012 +0200
620+
621+ adwaita gtk2: fix wrong adwaita engine declaration.
622+
623+ themes/Adwaita/gtk-2.0/gtkrc | 2 +-
624+ 1 file changed, 1 insertion(+), 1 deletion(-)
625+
626+commit 06db009e51ee7a766ac092f9491fc5536e473427
627+Author: Lapo Calamandrei <calamandrei@gmail.com>
628+Date: Fri Oct 5 15:02:29 2012 +0200
629+
630+ HC: tweak window decorations colors.
631+
632+ https://bugzilla.gnome.org/show_bug.cgi?id=672896
633+
634+ themes/HighContrast/gtk-3.0/gtk.css | 5 +
635+ .../HighContrast/metacity-1/metacity-theme-3.xml | 145 +++++++++++++++++----
636+ 2 files changed, 124 insertions(+), 26 deletions(-)
637+
638+commit dab8d1e0b72c3d8952ae476e6c47c0211d9a01f9
639+Author: Lapo Calamandrei <calamandrei@gmail.com>
640+Date: Fri Oct 5 14:17:51 2012 +0200
641+
642+ First stab at HC window decorations.
643+
644+ https://bugzilla.gnome.org/show_bug.cgi?id=672896
645+
646+ .../HighContrast/metacity-1/metacity-theme-3.xml | 351 ++++++---------------
647+ 1 file changed, 100 insertions(+), 251 deletions(-)
648+
649+commit 13722c091474bb965d519a611d9d8da0f530342b
650+Author: Cosimo Cecchi <cosimoc@gnome.org>
651+Date: Wed Sep 19 23:02:54 2012 -0400
652+
653+ First attempt at highcontrast WM theme
654+
655+ https://bugzilla.gnome.org/show_bug.cgi?id=672896
656+
657+ themes/HighContrast/gtk-3.0/gtk.css | 5 +
658+ .../HighContrast/metacity-1/metacity-theme-3.xml | 270 ++++++++++++---------
659+ 2 files changed, 161 insertions(+), 114 deletions(-)
660+
661+commit 6f6ae8fa438176ceee3cb6d8fa836f33a7cce1be
662+Author: Cosimo Cecchi <cosimoc@gnome.org>
663+Date: Wed Sep 19 14:26:38 2012 -0400
664+
665+ Copy Adwaita WM theme into HighContrast
666+
667+ https://bugzilla.gnome.org/show_bug.cgi?id=672896
668+
669+ configure.ac | 1 +
670+ themes/HighContrast/Makefile.am | 2 +-
671+ themes/HighContrast/index.theme.in | 2 +-
672+ themes/HighContrast/metacity-1/Makefile.am | 7 +
673+ .../HighContrast/metacity-1/metacity-theme-3.xml | 1941 ++++++++++++++++++++
674+ 5 files changed, 1951 insertions(+), 2 deletions(-)
675+
676+commit d5b6411da0d944507a7f9bbc5a8bfebce8d445ba
677+Author: Lapo Calamandrei <calamandrei@gmail.com>
678+Date: Tue Oct 9 16:21:04 2012 +0200
679+
680+ adwaita gtk3: remove toolbar separator from gnome contacts backdrop
681+ window, since I want no graidents in the backdrop state.
682+
683+ themes/Adwaita/gtk-3.0/gnome-applications.css | 14 ++++++++++----
684+ 1 file changed, 10 insertions(+), 4 deletions(-)
685+
686+commit d65fc84f1c794c23c4233df629044224fde609df
687+Author: Cosimo Cecchi <cosimoc@gnome.org>
688+Date: Tue Oct 9 00:53:30 2012 -0400
689+
690+ adwaita: improve GTK2 fallback menu stroke gradient
691+
692+ Add some color stops to make the outline gradient more refined.
693+
694+ themes/Adwaita/gtk-2.0/adwaita_engine.c | 17 ++++++++++++-----
695+ 1 file changed, 12 insertions(+), 5 deletions(-)
696+
697+commit 737530bc7d8fa11c7d1e83fbcd0fc0e5256127c0
698+Author: Cosimo Cecchi <cosimoc@gnome.org>
699+Date: Mon Oct 8 18:50:52 2012 -0400
700+
701+ adwaita: improve previous commit to work without GTK modules
702+
703+ This is useful when there's no g-s-d running at all. To implement this,
704+ add a custom GTK2 engine that only draws menus when the shell is not
705+ running, and move the GTK3 code in the existing engine.
706+
707+ configure.ac | 29 ++-
708+ src/adwaita_engine.c | 88 +++++++++
709+ themes/Adwaita/Makefile.am | 2 +-
710+ themes/Adwaita/gtk-2.0/Makefile.am | 9 +-
711+ themes/Adwaita/gtk-2.0/Menu-Menubar/frame.png | Bin 240 -> 0 bytes
712+ themes/Adwaita/gtk-2.0/adwaita_engine.c | 197 +++++++++++++++++++++
713+ themes/Adwaita/gtk-2.0/gtkrc | 26 +--
714+ themes/Adwaita/shell-watcher/Makefile.am | 11 --
715+ .../shell-watcher/adwaita-shell-watcher.desktop | 4 -
716+ themes/Adwaita/shell-watcher/gtk-2.0/Makefile.am | 7 -
717+ .../shell-watcher/gtk-2.0/shell-watcher-gtk2.c | 136 --------------
718+ themes/Adwaita/shell-watcher/gtk-3.0/Makefile.am | 7 -
719+ .../shell-watcher/gtk-3.0/shell-watcher-gtk3.c | 158 -----------------
720+ 13 files changed, 310 insertions(+), 364 deletions(-)
721+
722+commit 9c62ba404fa8a76d1c56cce4f066e94ccc637900
723+Author: Cosimo Cecchi <cosimoc@gnome.org>
724+Date: Sat Oct 6 00:27:07 2012 -0400
725+
726+ adwaita: override menu frame style when not running under the Shell
727+
728+ When we're not running under the shell, we're not guaranteed to have
729+ shadows rendered around menus; this is especially the case for fallback
730+ mode.
731+ Since we don't really have a way of loading a different theme for
732+ fallback mode from the settings daemon (or there might not even be a
733+ settings daemon around in case we're running on a completely different
734+ environment), we have to detect the presence of the Shell ourselves.
735+ Install a GTK module for this (both for GTK2 and GTK3), that watches the
736+ WM name on the GdkScreen and dynamically injects or removes frames on
737+ menus when the WM name matches GNOME Shell.
738+
739+ https://bugzilla.gnome.org/show_bug.cgi?id=660271
740+
741+ configure.ac | 17 +++
742+ themes/Adwaita/Makefile.am | 2 +-
743+ themes/Adwaita/gtk-2.0/Makefile.am | 1 +
744+ themes/Adwaita/gtk-2.0/Menu-Menubar/frame.png | Bin 0 -> 240 bytes
745+ themes/Adwaita/gtk-2.0/gtkrc | 30 ++++
746+ themes/Adwaita/gtk-3.0/Makefile.am | 1 +
747+ themes/Adwaita/gtk-3.0/gtk-fallback.css | 15 ++
748+ themes/Adwaita/gtk-3.0/gtk.gresource.xml | 1 +
749+ themes/Adwaita/shell-watcher/Makefile.am | 11 ++
750+ .../shell-watcher/adwaita-shell-watcher.desktop | 4 +
751+ themes/Adwaita/shell-watcher/gtk-2.0/Makefile.am | 7 +
752+ .../shell-watcher/gtk-2.0/shell-watcher-gtk2.c | 136 ++++++++++++++++++
753+ themes/Adwaita/shell-watcher/gtk-3.0/Makefile.am | 7 +
754+ .../shell-watcher/gtk-3.0/shell-watcher-gtk3.c | 158 +++++++++++++++++++++
755+ 14 files changed, 389 insertions(+), 1 deletion(-)
756+
757+commit bd74e4b26e45b5767991980626aaa4898de28cbc
758+Author: Lapo Calamandrei <calamandrei@gmail.com>
759+Date: Mon Oct 8 12:45:12 2012 +0200
760+
761+ adwaita gtk3: add some padding and border-radius to gcalctool scrolled window.
762+
763+ themes/Adwaita/gtk-3.0/gnome-applications.css | 13 +++++++++++++
764+ 1 file changed, 13 insertions(+)
765+
766+commit 3ae2a16dc15319f9357e9c6d8d5bc8950b70a018
767+Author: Lapo Calamandrei <calamandrei@gmail.com>
768+Date: Fri Oct 5 17:52:39 2012 +0200
769+
770+ adwaita wm: remove icon displacement on button press as we do in the gtk theme.
771+
772+ themes/Adwaita/metacity-1/metacity-theme-3.xml | 11 ++++++-----
773+ 1 file changed, 6 insertions(+), 5 deletions(-)
774+
775+commit 0ededbb81780616de189f32a5685f1f206f2e338
776+Author: Lapo Calamandrei <calamandrei@gmail.com>
777+Date: Fri Oct 5 17:47:32 2012 +0200
778+
779+ adwaita wm: fix right border on left tiled windows.
780+
781+ themes/Adwaita/metacity-1/metacity-theme-3.xml | 8 ++++----
782+ 1 file changed, 4 insertions(+), 4 deletions(-)
783+
784+commit 517c1ed014a9c12a810b6c26eb6846b4b5067d6b
785+Author: Lapo Calamandrei <calamandrei@gmail.com>
786+Date: Thu Oct 4 14:06:13 2012 +0200
787+
788+ gtk3: gedit status bar combobox styling.
789+
790+ themes/Adwaita/gtk-3.0/gnome-applications.css | 29 +++++++++++++++++++++++++++
791+ 1 file changed, 29 insertions(+)
792+
793+commit 661b16d57d94d46d509063aafc97f23ed4da842c
794+Author: Lapo Calamandrei <calamandrei@gmail.com>
795+Date: Thu Oct 4 13:57:58 2012 +0200
796+
797+ gtk3: evince style fixes
798+
799+ themes/Adwaita/gtk-3.0/gnome-applications.css | 41 +++++++++++++++++++++++++++
800+ 1 file changed, 41 insertions(+)
801+
802+commit 6aa3d80471e8806476993b839774e37804975328
803+Author: Cosimo Cecchi <cosimoc@gnome.org>
804+Date: Thu Oct 4 09:21:03 2012 -0400
805+
806+ Revert "Add a stub style for the dragged treeview column header"
807+
808+ Pushed by mistake
809+
810+ This reverts commit 7b3dac1115cb4d6eef366743a7b330788922fed8.
811+
812+ themes/Adwaita/gtk-3.0/gtk-widgets.css | 10 ----------
813+ 1 file changed, 10 deletions(-)
814+
815+commit 4fcbadf911eafdf5e51fb660a99a88f895578d22
816+Author: Cosimo Cecchi <cosimoc@gnome.org>
817+Date: Thu Oct 4 08:54:32 2012 -0400
818+
819+ notebook: fix border for vertical tabs
820+
821+ Regression from 34e1d166fadd2f14aa0f711d569f68b17d2f6f48
822+
823+ themes/Adwaita/gtk-3.0/gtk-widgets.css | 17 ++++++++++++-----
824+ 1 file changed, 12 insertions(+), 5 deletions(-)
825+
826+commit 7b3dac1115cb4d6eef366743a7b330788922fed8
827+Author: Stefano Facchini <stefano.facchini@gmail.com>
828+Date: Thu Sep 27 19:07:24 2012 +0200
829+
830+ Add a stub style for the dragged treeview column header
831+
832+ https://bugzilla.gnome.org/show_bug.cgi?id=684982
833+
834+ themes/Adwaita/gtk-3.0/gtk-widgets.css | 10 ++++++++++
835+ 1 file changed, 10 insertions(+)
836+
837+commit 34e1d166fadd2f14aa0f711d569f68b17d2f6f48 (wip/fucking-movement)
838+Author: Cosimo Cecchi <cosimoc@gnome.org>
839+Date: Tue Oct 2 20:30:20 2012 -0400
840+
841+ adwaita: use border-image-source for the tab gradient
842+
843+ Following the same logic of the previous commit.
844+ This also entirely removes custom style properties from the theming
845+ engine.
846+
847+ src/adwaita_engine.c | 7 +------
848+ themes/Adwaita/gtk-3.0/gtk-widgets.css | 17 ++++++++---------
849+ 2 files changed, 9 insertions(+), 15 deletions(-)
850+
851+commit 6e641cf46cc70ce770482b3fc331b1fa3cd7af2b
852+Author: Cosimo Cecchi <cosimoc@gnome.org>
853+Date: Tue Oct 2 20:24:57 2012 -0400
854+
855+ adwaita: use outline properties for focus instead of engine properties
856+
857+ This is a bit of a hack, but the problem is that using custom
858+ engine properties for focus triggers some sort of slow path in the
859+ GTK+ style validation, and this makes state changes sluggish in complex
860+ treeview layouts.
861+ Until focus rendering in GTK is fixed, the workaround is to use some
862+ real CSS properties, which get a different caching treatment (but the
863+ engine still manually queries the final value and does the rendering
864+ itself).
865+ This also gives us the occasion to get rid of those custom properties
866+ altogether.
867+
868+ https://bugzilla.gnome.org/show_bug.cgi?id=684499
869+
870+ src/adwaita_engine.c | 27 ++++------------------
871+ .../Adwaita/gtk-3.0/gtk-widgets-dark-overrides.css | 6 ++---
872+ themes/Adwaita/gtk-3.0/gtk-widgets.css | 26 +++++++++++----------
873+ 3 files changed, 22 insertions(+), 37 deletions(-)
874+
875+commit 124230ccd4171bbf209c762c0d532e7213fe7f55
876+Author: Lapo Calamandrei <calamandrei@gmail.com>
877+Date: Tue Oct 2 13:31:38 2012 +0200
878+
879+ gtk3: remove borders and set border-radius to 0 to documents load more button.
880+
881+ themes/Adwaita/gtk-3.0/gnome-applications.css | 5 +++--
882+ 1 file changed, 3 insertions(+), 2 deletions(-)
883+
884+commit bbe1a1b33815a6f35dee98938e137dec676b87f6
885+Author: Lapo Calamandrei <calamandrei@gmail.com>
886+Date: Sun Sep 30 13:49:23 2012 +0200
887+
888+ gtk3: sync gtk-widget-borders-dark.css.
889+
890+ themes/Adwaita/gtk-3.0/gtk-widgets-borders-dark.css | 2 ++
891+ 1 file changed, 2 insertions(+)
892+
893+commit c934e2ab253fd8b87960d0bacedd66ef5e79761d
894+Author: Lapo Calamandrei <calamandrei@gmail.com>
895+Date: Sun Sep 30 13:08:25 2012 +0200
896+
897+ gtk3: fix selection toolbar done button backdrop state and minor tweaks to
898+ normal state.
899+
900+ Some css simplifications.
901+
902+ themes/Adwaita/gtk-3.0/gtk-main-common.css | 2 +-
903+ themes/Adwaita/gtk-3.0/gtk-widgets.css | 50 +++++++++++++++---------------
904+ 2 files changed, 26 insertions(+), 26 deletions(-)
905+
906+commit 58f23e99863a1ba8fab868bca1068297175e79ca
907+Author: Lapo Calamandrei <calamandrei@gmail.com>
908+Date: Sun Sep 30 12:25:33 2012 +0200
909+
910+ gtk3: fix suggested-action button text and icon shadows on pushed state.
911+
912+ themes/Adwaita/gtk-3.0/gtk-widgets.css | 6 ++++++
913+ 1 file changed, 6 insertions(+)
914+
915+commit f8fb85aab1a2e6ffee39a20f856a33bc7003985a
916+Author: Lapo Calamandrei <calamandrei@gmail.com>
917+Date: Sun Sep 30 12:13:40 2012 +0200
918+
919+ gtk3: added transparent borders assets for colored buttons usage.
920+
921+ Fix selection-mode toolbar paddings to maintain the same button
922+ positioning of normal toolbars.
923+
924+ Fix some (apparently innocuos) typos.
925+
926+ themes/Adwaita/gtk-3.0/assets.svg | 1070 ++++++--------------
927+ themes/Adwaita/gtk-3.0/borders.txt | 4 +
928+ themes/Adwaita/gtk-3.0/borders/Makefile.am | 4 +
929+ .../borders/generic-border-transparent-dark.png | Bin 0 -> 298 bytes
930+ .../gtk-3.0/borders/generic-border-transparent.png | Bin 0 -> 308 bytes
931+ .../nohl-generic-border-transparent-dark.png | Bin 0 -> 247 bytes
932+ .../borders/nohl-generic-border-transparent.png | Bin 0 -> 238 bytes
933+ themes/Adwaita/gtk-3.0/gnome-applications.css | 1 +
934+ themes/Adwaita/gtk-3.0/gtk-main.css | 1 -
935+ .../Adwaita/gtk-3.0/gtk-widgets-borders-dark.css | 11 +
936+ themes/Adwaita/gtk-3.0/gtk-widgets-borders.css | 13 +
937+ themes/Adwaita/gtk-3.0/gtk-widgets.css | 26 +-
938+ themes/Adwaita/gtk-3.0/gtk.gresource.xml | 4 +
939+ 13 files changed, 369 insertions(+), 765 deletions(-)
940+
941+commit 9318224e9df7f6258f68467f252964d8f9919a16
942+Author: Cosimo Cecchi <cosimoc@gnome.org>
943+Date: Fri Sep 28 20:31:26 2012 -0400
944+
945+ nautilus: fix selected desktop item colors
946+
947+ https://bugzilla.gnome.org/show_bug.cgi?id=683423
948+
949+ themes/Adwaita/gtk-3.0/gnome-applications.css | 4 ++++
950+ themes/HighContrast/gtk-3.0/gtk-widgets.css | 19 +++++++++++++++++++
951+ 2 files changed, 23 insertions(+)
952+
953+commit 7bf573f542f329e2fbd6fade57e62843d60787e3 (tag: 3.6.0.2)
954 Author: Cosimo Cecchi <cosimoc@gnome.org>
955 Date: Tue Sep 25 14:13:24 2012 -0400
956
957@@ -10,7 +732,7 @@
958 configure.ac | 2 +-
959 2 files changed, 11 insertions(+), 1 deletion(-)
960
961-commit e7b7fb67383e20ace56ae9f48080348ff37cede9 (origin/master, origin/HEAD)
962+commit e7b7fb67383e20ace56ae9f48080348ff37cede9
963 Author: Cosimo Cecchi <cosimoc@gnome.org>
964 Date: Tue Sep 25 13:55:51 2012 -0400
965
966
967=== modified file 'Makefile.am'
968--- Makefile.am 2011-01-23 00:20:57 +0000
969+++ Makefile.am 2012-11-22 00:35:57 +0000
970@@ -1,4 +1,4 @@
971-SUBDIRS = src themes po
972+SUBDIRS = themes po
973
974 MAINTAINERCLEANFILES = \
975 Makefile.in \
976
977=== modified file 'Makefile.in'
978--- Makefile.in 2012-08-08 11:44:00 +0000
979+++ Makefile.in 2012-11-22 00:35:57 +0000
980@@ -63,6 +63,18 @@
981 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
982 CONFIG_CLEAN_FILES =
983 CONFIG_CLEAN_VPATH_FILES =
984+AM_V_P = $(am__v_P_@AM_V@)
985+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
986+am__v_P_0 = false
987+am__v_P_1 = :
988+AM_V_GEN = $(am__v_GEN_@AM_V@)
989+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
990+am__v_GEN_0 = @echo " GEN " $@;
991+am__v_GEN_1 =
992+AM_V_at = $(am__v_at_@AM_V@)
993+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
994+am__v_at_0 = @
995+am__v_at_1 =
996 SOURCES =
997 DIST_SOURCES =
998 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
999@@ -150,8 +162,6 @@
1000 DATADIRNAME = @DATADIRNAME@
1001 DEFS = @DEFS@
1002 DEPDIR = @DEPDIR@
1003-DEPENDENCIES_CFLAGS = @DEPENDENCIES_CFLAGS@
1004-DEPENDENCIES_LIBS = @DEPENDENCIES_LIBS@
1005 DLLTOOL = @DLLTOOL@
1006 DSYMUTIL = @DSYMUTIL@
1007 DUMPBIN = @DUMPBIN@
1008@@ -171,8 +181,13 @@
1009 GMSGFMT = @GMSGFMT@
1010 GOBJECT_QUERY = @GOBJECT_QUERY@
1011 GREP = @GREP@
1012+GTK2_ENGINE_CFLAGS = @GTK2_ENGINE_CFLAGS@
1013+GTK2_ENGINE_LIBS = @GTK2_ENGINE_LIBS@
1014+GTK2_VERSION = @GTK2_VERSION@
1015+GTK3_ENGINE_CFLAGS = @GTK3_ENGINE_CFLAGS@
1016+GTK3_ENGINE_LIBS = @GTK3_ENGINE_LIBS@
1017+GTK3_VERSION = @GTK3_VERSION@
1018 GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
1019-GTK_VERSION = @GTK_VERSION@
1020 HIGHCONTRAST_CFLAGS = @HIGHCONTRAST_CFLAGS@
1021 HIGHCONTRAST_LIBS = @HIGHCONTRAST_LIBS@
1022 INSTALL = @INSTALL@
1023@@ -288,7 +303,7 @@
1024 top_build_prefix = @top_build_prefix@
1025 top_builddir = @top_builddir@
1026 top_srcdir = @top_srcdir@
1027-SUBDIRS = src themes po
1028+SUBDIRS = themes po
1029 MAINTAINERCLEANFILES = \
1030 Makefile.in \
1031 aclocal.m4 \
1032
1033=== modified file 'NEWS'
1034--- NEWS 2012-10-02 00:58:28 +0000
1035+++ NEWS 2012-11-22 00:35:57 +0000
1036@@ -1,3 +1,36 @@
1037+3.7.2
1038+=====
1039+
1040+Use .background instead of GtkWindow to style the window background
1041+Fix insensitive menu items background
1042+Add a box-shadow in inline toolbars
1043+Tweak paddings in toolbars
1044+Improve theming support for Baobab
1045+
1046+3.6.2
1047+=====
1048+
1049+Add assets for insensitive radio/check states for the GTK2 theme
1050+Fix active spinner when no animations are in use
1051+Fix gray menu separators under some circumstances
1052+Fix the build on non-X11 environments
1053+Fix uneven padding on the notebook tab close button
1054+Fix minor glitch with borders of tiled WM decorations
1055+
1056+3.6.1
1057+=====
1058+
1059+Add a matching HighContrast WM theme
1060+Add support for vertically oriented inline toolbars
1061+Fix wrong background for raised and backdrop insensitive toolbar buttons
1062+Fix glitches in selection-toolbar and suggested-action styling
1063+Fix menu borders not present when not running under GNOME Shell
1064+Fix color for selected desktop icons
1065+Fix stray text shadows in inline toolbar buttons
1066+Fix wrong background color when using a menu button in an OSD toolbar
1067+Fix some glitches in notebook's tab rendering
1068+Improve theming support for Nautilus, Documents, Evince, GEdit, Baobab and more
1069+
1070 3.6.0.2
1071 =======
1072
1073
1074=== modified file 'aclocal.m4'
1075--- aclocal.m4 2012-08-08 11:44:00 +0000
1076+++ aclocal.m4 2012-11-22 00:35:57 +0000
1077@@ -878,6 +878,68 @@
1078 rm -f conftest.file
1079 ])
1080
1081+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
1082+#
1083+# This file is free software; the Free Software Foundation
1084+# gives unlimited permission to copy and/or distribute it,
1085+# with or without modifications, as long as this notice is preserved.
1086+
1087+# serial 3
1088+
1089+# AM_SILENT_RULES([DEFAULT])
1090+# --------------------------
1091+# Enable less verbose build rules; with the default set to DEFAULT
1092+# ("yes" being less verbose, "no" or empty being verbose).
1093+AC_DEFUN([AM_SILENT_RULES],
1094+[AC_ARG_ENABLE([silent-rules], [dnl
1095+AS_HELP_STRING(
1096+ [--enable-silent-rules],
1097+ [less verbose build output (undo: "make V=1")])
1098+AS_HELP_STRING(
1099+ [--disable-silent-rules],
1100+ [verbose build output (undo: "make V=0")])dnl
1101+])
1102+case $enable_silent_rules in @%:@ (((
1103+ yes) AM_DEFAULT_VERBOSITY=0;;
1104+ no) AM_DEFAULT_VERBOSITY=1;;
1105+ *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
1106+esac
1107+dnl
1108+dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
1109+dnl do not support nested variable expansions.
1110+dnl See automake bug#9928 and bug#10237.
1111+am_make=${MAKE-make}
1112+AC_CACHE_CHECK([whether $am_make supports nested variables],
1113+ [am_cv_make_support_nested_variables],
1114+ [if AS_ECHO([['TRUE=$(BAR$(V))
1115+BAR0=false
1116+BAR1=true
1117+V=1
1118+am__doit:
1119+ @$(TRUE)
1120+.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then
1121+ am_cv_make_support_nested_variables=yes
1122+else
1123+ am_cv_make_support_nested_variables=no
1124+fi])
1125+if test $am_cv_make_support_nested_variables = yes; then
1126+ dnl Using '$V' instead of '$(V)' breaks IRIX make.
1127+ AM_V='$(V)'
1128+ AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
1129+else
1130+ AM_V=$AM_DEFAULT_VERBOSITY
1131+ AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
1132+fi
1133+AC_SUBST([AM_V])dnl
1134+AM_SUBST_NOTMAKE([AM_V])dnl
1135+AC_SUBST([AM_DEFAULT_V])dnl
1136+AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
1137+AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
1138+AM_BACKSLASH='\'
1139+AC_SUBST([AM_BACKSLASH])dnl
1140+_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
1141+])
1142+
1143 # Copyright (C) 2001-2012 Free Software Foundation, Inc.
1144 #
1145 # This file is free software; the Free Software Foundation
1146
1147=== modified file 'configure'
1148--- configure 2012-10-02 00:58:28 +0000
1149+++ configure 2012-11-22 00:35:57 +0000
1150@@ -1,6 +1,6 @@
1151 #! /bin/sh
1152 # Guess values for system-dependent variables and create Makefiles.
1153-# Generated by GNU Autoconf 2.69 for gnome-themes-standard 3.6.0.2.
1154+# Generated by GNU Autoconf 2.69 for gnome-themes-standard 3.7.2.
1155 #
1156 # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-themes-standard>.
1157 #
1158@@ -591,8 +591,8 @@
1159 # Identity of this package.
1160 PACKAGE_NAME='gnome-themes-standard'
1161 PACKAGE_TARNAME='gnome-themes-standard'
1162-PACKAGE_VERSION='3.6.0.2'
1163-PACKAGE_STRING='gnome-themes-standard 3.6.0.2'
1164+PACKAGE_VERSION='3.7.2'
1165+PACKAGE_STRING='gnome-themes-standard 3.7.2'
1166 PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-themes-standard'
1167 PACKAGE_URL=''
1168
1169@@ -640,13 +640,18 @@
1170 GTK_UPDATE_ICON_CACHE
1171 PLACEHOLDERS_FALSE
1172 PLACEHOLDERS_TRUE
1173-GTK_VERSION
1174+GTK2_ENGINE_LIBS
1175+GTK2_ENGINE_CFLAGS
1176+GTK2_ENGINE_FALSE
1177+GTK2_ENGINE_TRUE
1178+GTK2_VERSION
1179+GTK3_VERSION
1180 HIGHCONTRAST_LIBS
1181 HIGHCONTRAST_CFLAGS
1182-DEPENDENCIES_LIBS
1183-DEPENDENCIES_CFLAGS
1184-GTK3_FALSE
1185-GTK3_TRUE
1186+GTK3_ENGINE_LIBS
1187+GTK3_ENGINE_CFLAGS
1188+GTK3_ENGINE_FALSE
1189+GTK3_ENGINE_TRUE
1190 MKINSTALLDIRS
1191 POSUB
1192 POFILES
1193@@ -691,7 +696,6 @@
1194 INTLTOOL__v_MERGE_0
1195 INTLTOOL__v_MERGE_
1196 INTLTOOL_V_MERGE
1197-AM_DEFAULT_VERBOSITY
1198 INTLTOOL_EXTRACT
1199 INTLTOOL_MERGE
1200 INTLTOOL_UPDATE
1201@@ -753,6 +757,10 @@
1202 PKG_CONFIG_LIBDIR
1203 PKG_CONFIG_PATH
1204 PKG_CONFIG
1205+AM_BACKSLASH
1206+AM_DEFAULT_VERBOSITY
1207+AM_DEFAULT_V
1208+AM_V
1209 am__untar
1210 am__tar
1211 AMTAR
1212@@ -817,6 +825,7 @@
1213 ac_subst_files=''
1214 ac_user_opts='
1215 enable_option_checking
1216+enable_silent_rules
1217 enable_dependency_tracking
1218 enable_glibtest
1219 enable_static
1220@@ -827,7 +836,8 @@
1221 with_sysroot
1222 enable_libtool_lock
1223 enable_nls
1224-enable_gtk3_engines
1225+enable_gtk3_engine
1226+enable_gtk2_engine
1227 enable_placeholders
1228 '
1229 ac_precious_vars='build_alias
1230@@ -842,10 +852,12 @@
1231 LIBS
1232 CPPFLAGS
1233 CPP
1234-DEPENDENCIES_CFLAGS
1235-DEPENDENCIES_LIBS
1236+GTK3_ENGINE_CFLAGS
1237+GTK3_ENGINE_LIBS
1238 HIGHCONTRAST_CFLAGS
1239-HIGHCONTRAST_LIBS'
1240+HIGHCONTRAST_LIBS
1241+GTK2_ENGINE_CFLAGS
1242+GTK2_ENGINE_LIBS'
1243
1244
1245 # Initialize some variables set by options.
1246@@ -1386,7 +1398,7 @@
1247 # Omit some internal or obsolete options to make the list less imposing.
1248 # This message is too long to be a string in the A/UX 3.1 sh.
1249 cat <<_ACEOF
1250-\`configure' configures gnome-themes-standard 3.6.0.2 to adapt to many kinds of systems.
1251+\`configure' configures gnome-themes-standard 3.7.2 to adapt to many kinds of systems.
1252
1253 Usage: $0 [OPTION]... [VAR=VALUE]...
1254
1255@@ -1457,7 +1469,7 @@
1256
1257 if test -n "$ac_init_help"; then
1258 case $ac_init_help in
1259- short | recursive ) echo "Configuration of gnome-themes-standard 3.6.0.2:";;
1260+ short | recursive ) echo "Configuration of gnome-themes-standard 3.7.2:";;
1261 esac
1262 cat <<\_ACEOF
1263
1264@@ -1465,6 +1477,8 @@
1265 --disable-option-checking ignore unrecognized --enable/--with options
1266 --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
1267 --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
1268+ --enable-silent-rules less verbose build output (undo: "make V=1")
1269+ --disable-silent-rules verbose build output (undo: "make V=0")
1270 --enable-dependency-tracking
1271 do not reject slow dependency extractors
1272 --disable-dependency-tracking
1273@@ -1476,7 +1490,8 @@
1274 optimize for fast installation [default=yes]
1275 --disable-libtool-lock avoid locking (might break parallel builds)
1276 --disable-nls do not use Native Language Support
1277- --disable-gtk3-engines Disable Gtk+ 3.x engines [default=no]
1278+ --disable-gtk3-engine Disable Gtk+ 3.x engine [default=no]
1279+ --disable-gtk2-engine Disable Gtk+-2 engine [default=no]
1280 --enable-placeholders Enable placeholder icons [default=no]
1281
1282 Optional Packages:
1283@@ -1502,14 +1517,18 @@
1284 CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
1285 you have headers in a nonstandard directory <include dir>
1286 CPP C preprocessor
1287- DEPENDENCIES_CFLAGS
1288- C compiler flags for DEPENDENCIES, overriding pkg-config
1289- DEPENDENCIES_LIBS
1290- linker flags for DEPENDENCIES, overriding pkg-config
1291+ GTK3_ENGINE_CFLAGS
1292+ C compiler flags for GTK3_ENGINE, overriding pkg-config
1293+ GTK3_ENGINE_LIBS
1294+ linker flags for GTK3_ENGINE, overriding pkg-config
1295 HIGHCONTRAST_CFLAGS
1296 C compiler flags for HIGHCONTRAST, overriding pkg-config
1297 HIGHCONTRAST_LIBS
1298 linker flags for HIGHCONTRAST, overriding pkg-config
1299+ GTK2_ENGINE_CFLAGS
1300+ C compiler flags for GTK2_ENGINE, overriding pkg-config
1301+ GTK2_ENGINE_LIBS
1302+ linker flags for GTK2_ENGINE, overriding pkg-config
1303
1304 Use these variables to override the choices made by `configure' or to help
1305 it to find libraries and programs with nonstandard names/locations.
1306@@ -1577,7 +1596,7 @@
1307 test -n "$ac_init_help" && exit $ac_status
1308 if $ac_init_version; then
1309 cat <<\_ACEOF
1310-gnome-themes-standard configure 3.6.0.2
1311+gnome-themes-standard configure 3.7.2
1312 generated by GNU Autoconf 2.69
1313
1314 Copyright (C) 2012 Free Software Foundation, Inc.
1315@@ -1946,7 +1965,7 @@
1316 This file contains any messages produced by compilers while
1317 running configure, to aid debugging if configure makes a mistake.
1318
1319-It was created by gnome-themes-standard $as_me 3.6.0.2, which was
1320+It was created by gnome-themes-standard $as_me 3.7.2, which was
1321 generated by GNU Autoconf 2.69. Invocation command line was
1322
1323 $ $0 $@
1324@@ -2771,7 +2790,7 @@
1325
1326 # Define the identity of the package.
1327 PACKAGE='gnome-themes-standard'
1328- VERSION='3.6.0.2'
1329+ VERSION='3.7.2'
1330
1331
1332 cat >>confdefs.h <<_ACEOF
1333@@ -2898,6 +2917,45 @@
1334
1335
1336
1337+# Check whether --enable-silent-rules was given.
1338+if test "${enable_silent_rules+set}" = set; then :
1339+ enableval=$enable_silent_rules;
1340+fi
1341+
1342+case $enable_silent_rules in # (((
1343+ yes) AM_DEFAULT_VERBOSITY=0;;
1344+ no) AM_DEFAULT_VERBOSITY=1;;
1345+ *) AM_DEFAULT_VERBOSITY=0;;
1346+esac
1347+am_make=${MAKE-make}
1348+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
1349+$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
1350+if ${am_cv_make_support_nested_variables+:} false; then :
1351+ $as_echo_n "(cached) " >&6
1352+else
1353+ if $as_echo 'TRUE=$(BAR$(V))
1354+BAR0=false
1355+BAR1=true
1356+V=1
1357+am__doit:
1358+ @$(TRUE)
1359+.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
1360+ am_cv_make_support_nested_variables=yes
1361+else
1362+ am_cv_make_support_nested_variables=no
1363+fi
1364+fi
1365+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
1366+$as_echo "$am_cv_make_support_nested_variables" >&6; }
1367+if test $am_cv_make_support_nested_variables = yes; then
1368+ AM_V='$(V)'
1369+ AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
1370+else
1371+ AM_V=$AM_DEFAULT_VERBOSITY
1372+ AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
1373+fi
1374+AM_BACKSLASH='\'
1375+
1376
1377
1378
1379@@ -13759,35 +13817,35 @@
1380 < $srcdir/po/POTFILES.in > po/POTFILES
1381
1382
1383-# Check whether --enable-gtk3-engines was given.
1384-if test "${enable_gtk3_engines+set}" = set; then :
1385- enableval=$enable_gtk3_engines; enable_gtk3=$enableval
1386-else
1387- enable_gtk3=yes
1388-fi
1389-
1390-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking building gtk3 engines" >&5
1391-$as_echo_n "checking building gtk3 engines... " >&6; }
1392- if test "x$enable_gtk3" = "xyes"; then
1393- GTK3_TRUE=
1394- GTK3_FALSE='#'
1395-else
1396- GTK3_TRUE='#'
1397- GTK3_FALSE=
1398-fi
1399-
1400-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gtk3" >&5
1401-$as_echo "$enable_gtk3" >&6; }
1402+# Check whether --enable-gtk3-engine was given.
1403+if test "${enable_gtk3_engine+set}" = set; then :
1404+ enableval=$enable_gtk3_engine; enable_gtk3_engine=$enableval
1405+else
1406+ enable_gtk3_engine=yes
1407+fi
1408+
1409+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking building gtk3 engine" >&5
1410+$as_echo_n "checking building gtk3 engine... " >&6; }
1411+ if test "x$enable_gtk3_engine" = "xyes"; then
1412+ GTK3_ENGINE_TRUE=
1413+ GTK3_ENGINE_FALSE='#'
1414+else
1415+ GTK3_ENGINE_TRUE='#'
1416+ GTK3_ENGINE_FALSE=
1417+fi
1418+
1419+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gtk3_engine" >&5
1420+$as_echo "$enable_gtk3_engine" >&6; }
1421+
1422 GTK_VERSION_REQUIRED=3.5.17
1423-
1424-if test "x$enable_gtk3" = "xyes"; then
1425+if test "x$enable_gtk3_engine" = "xyes"; then
1426
1427 pkg_failed=no
1428-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DEPENDENCIES" >&5
1429-$as_echo_n "checking for DEPENDENCIES... " >&6; }
1430+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK3_ENGINE" >&5
1431+$as_echo_n "checking for GTK3_ENGINE... " >&6; }
1432
1433-if test -n "$DEPENDENCIES_CFLAGS"; then
1434- pkg_cv_DEPENDENCIES_CFLAGS="$DEPENDENCIES_CFLAGS"
1435+if test -n "$GTK3_ENGINE_CFLAGS"; then
1436+ pkg_cv_GTK3_ENGINE_CFLAGS="$GTK3_ENGINE_CFLAGS"
1437 elif test -n "$PKG_CONFIG"; then
1438 if test -n "$PKG_CONFIG" && \
1439 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= \$GTK_VERSION_REQUIRED librsvg-2.0\""; } >&5
1440@@ -13795,7 +13853,7 @@
1441 ac_status=$?
1442 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1443 test $ac_status = 0; }; then
1444- pkg_cv_DEPENDENCIES_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0 >= $GTK_VERSION_REQUIRED librsvg-2.0" 2>/dev/null`
1445+ pkg_cv_GTK3_ENGINE_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0 >= $GTK_VERSION_REQUIRED librsvg-2.0" 2>/dev/null`
1446 test "x$?" != "x0" && pkg_failed=yes
1447 else
1448 pkg_failed=yes
1449@@ -13803,8 +13861,8 @@
1450 else
1451 pkg_failed=untried
1452 fi
1453-if test -n "$DEPENDENCIES_LIBS"; then
1454- pkg_cv_DEPENDENCIES_LIBS="$DEPENDENCIES_LIBS"
1455+if test -n "$GTK3_ENGINE_LIBS"; then
1456+ pkg_cv_GTK3_ENGINE_LIBS="$GTK3_ENGINE_LIBS"
1457 elif test -n "$PKG_CONFIG"; then
1458 if test -n "$PKG_CONFIG" && \
1459 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= \$GTK_VERSION_REQUIRED librsvg-2.0\""; } >&5
1460@@ -13812,7 +13870,7 @@
1461 ac_status=$?
1462 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1463 test $ac_status = 0; }; then
1464- pkg_cv_DEPENDENCIES_LIBS=`$PKG_CONFIG --libs "gtk+-3.0 >= $GTK_VERSION_REQUIRED librsvg-2.0" 2>/dev/null`
1465+ pkg_cv_GTK3_ENGINE_LIBS=`$PKG_CONFIG --libs "gtk+-3.0 >= $GTK_VERSION_REQUIRED librsvg-2.0" 2>/dev/null`
1466 test "x$?" != "x0" && pkg_failed=yes
1467 else
1468 pkg_failed=yes
1469@@ -13833,22 +13891,22 @@
1470 _pkg_short_errors_supported=no
1471 fi
1472 if test $_pkg_short_errors_supported = yes; then
1473- DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-3.0 >= $GTK_VERSION_REQUIRED librsvg-2.0" 2>&1`
1474+ GTK3_ENGINE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-3.0 >= $GTK_VERSION_REQUIRED librsvg-2.0" 2>&1`
1475 else
1476- DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-3.0 >= $GTK_VERSION_REQUIRED librsvg-2.0" 2>&1`
1477+ GTK3_ENGINE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-3.0 >= $GTK_VERSION_REQUIRED librsvg-2.0" 2>&1`
1478 fi
1479 # Put the nasty error message in config.log where it belongs
1480- echo "$DEPENDENCIES_PKG_ERRORS" >&5
1481+ echo "$GTK3_ENGINE_PKG_ERRORS" >&5
1482
1483 as_fn_error $? "Package requirements (gtk+-3.0 >= $GTK_VERSION_REQUIRED librsvg-2.0) were not met:
1484
1485-$DEPENDENCIES_PKG_ERRORS
1486+$GTK3_ENGINE_PKG_ERRORS
1487
1488 Consider adjusting the PKG_CONFIG_PATH environment variable if you
1489 installed software in a non-standard prefix.
1490
1491-Alternatively, you may set the environment variables DEPENDENCIES_CFLAGS
1492-and DEPENDENCIES_LIBS to avoid the need to call pkg-config.
1493+Alternatively, you may set the environment variables GTK3_ENGINE_CFLAGS
1494+and GTK3_ENGINE_LIBS to avoid the need to call pkg-config.
1495 See the pkg-config man page for more details." "$LINENO" 5
1496 elif test $pkg_failed = untried; then
1497 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1498@@ -13859,15 +13917,15 @@
1499 is in your PATH or set the PKG_CONFIG environment variable to the full
1500 path to pkg-config.
1501
1502-Alternatively, you may set the environment variables DEPENDENCIES_CFLAGS
1503-and DEPENDENCIES_LIBS to avoid the need to call pkg-config.
1504+Alternatively, you may set the environment variables GTK3_ENGINE_CFLAGS
1505+and GTK3_ENGINE_LIBS to avoid the need to call pkg-config.
1506 See the pkg-config man page for more details.
1507
1508 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
1509 See \`config.log' for more details" "$LINENO" 5; }
1510 else
1511- DEPENDENCIES_CFLAGS=$pkg_cv_DEPENDENCIES_CFLAGS
1512- DEPENDENCIES_LIBS=$pkg_cv_DEPENDENCIES_LIBS
1513+ GTK3_ENGINE_CFLAGS=$pkg_cv_GTK3_ENGINE_CFLAGS
1514+ GTK3_ENGINE_LIBS=$pkg_cv_GTK3_ENGINE_LIBS
1515 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
1516 $as_echo "yes" >&6; }
1517
1518@@ -13965,10 +14023,125 @@
1519 fi
1520 fi
1521
1522-
1523-
1524-GTK_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-3.0`
1525-
1526+GTK3_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-3.0`
1527+
1528+
1529+GTK2_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0`
1530+
1531+
1532+# Check whether --enable-gtk2-engine was given.
1533+if test "${enable_gtk2_engine+set}" = set; then :
1534+ enableval=$enable_gtk2_engine; enable_gtk2_engine=$enableval
1535+else
1536+ enable_gtk2_engine=yes
1537+fi
1538+
1539+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking building gtk2 engine" >&5
1540+$as_echo_n "checking building gtk2 engine... " >&6; }
1541+ if test "x$enable_gtk2_engine" = "xyes"; then
1542+ GTK2_ENGINE_TRUE=
1543+ GTK2_ENGINE_FALSE='#'
1544+else
1545+ GTK2_ENGINE_TRUE='#'
1546+ GTK2_ENGINE_FALSE=
1547+fi
1548+
1549+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gtk2_engine" >&5
1550+$as_echo "$enable_gtk2_engine" >&6; }
1551+
1552+if test "x$enable_gtk2_engine" = "xyes"; then
1553+
1554+pkg_failed=no
1555+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK2_ENGINE" >&5
1556+$as_echo_n "checking for GTK2_ENGINE... " >&6; }
1557+
1558+if test -n "$GTK2_ENGINE_CFLAGS"; then
1559+ pkg_cv_GTK2_ENGINE_CFLAGS="$GTK2_ENGINE_CFLAGS"
1560+ elif test -n "$PKG_CONFIG"; then
1561+ if test -n "$PKG_CONFIG" && \
1562+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 gdk-2.0\""; } >&5
1563+ ($PKG_CONFIG --exists --print-errors "gtk+-2.0 gdk-2.0") 2>&5
1564+ ac_status=$?
1565+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1566+ test $ac_status = 0; }; then
1567+ pkg_cv_GTK2_ENGINE_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 gdk-2.0" 2>/dev/null`
1568+ test "x$?" != "x0" && pkg_failed=yes
1569+else
1570+ pkg_failed=yes
1571+fi
1572+ else
1573+ pkg_failed=untried
1574+fi
1575+if test -n "$GTK2_ENGINE_LIBS"; then
1576+ pkg_cv_GTK2_ENGINE_LIBS="$GTK2_ENGINE_LIBS"
1577+ elif test -n "$PKG_CONFIG"; then
1578+ if test -n "$PKG_CONFIG" && \
1579+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 gdk-2.0\""; } >&5
1580+ ($PKG_CONFIG --exists --print-errors "gtk+-2.0 gdk-2.0") 2>&5
1581+ ac_status=$?
1582+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1583+ test $ac_status = 0; }; then
1584+ pkg_cv_GTK2_ENGINE_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 gdk-2.0" 2>/dev/null`
1585+ test "x$?" != "x0" && pkg_failed=yes
1586+else
1587+ pkg_failed=yes
1588+fi
1589+ else
1590+ pkg_failed=untried
1591+fi
1592+
1593+
1594+
1595+if test $pkg_failed = yes; then
1596+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1597+$as_echo "no" >&6; }
1598+
1599+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
1600+ _pkg_short_errors_supported=yes
1601+else
1602+ _pkg_short_errors_supported=no
1603+fi
1604+ if test $_pkg_short_errors_supported = yes; then
1605+ GTK2_ENGINE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-2.0 gdk-2.0" 2>&1`
1606+ else
1607+ GTK2_ENGINE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-2.0 gdk-2.0" 2>&1`
1608+ fi
1609+ # Put the nasty error message in config.log where it belongs
1610+ echo "$GTK2_ENGINE_PKG_ERRORS" >&5
1611+
1612+ as_fn_error $? "Package requirements (gtk+-2.0 gdk-2.0) were not met:
1613+
1614+$GTK2_ENGINE_PKG_ERRORS
1615+
1616+Consider adjusting the PKG_CONFIG_PATH environment variable if you
1617+installed software in a non-standard prefix.
1618+
1619+Alternatively, you may set the environment variables GTK2_ENGINE_CFLAGS
1620+and GTK2_ENGINE_LIBS to avoid the need to call pkg-config.
1621+See the pkg-config man page for more details." "$LINENO" 5
1622+elif test $pkg_failed = untried; then
1623+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1624+$as_echo "no" >&6; }
1625+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
1626+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
1627+as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
1628+is in your PATH or set the PKG_CONFIG environment variable to the full
1629+path to pkg-config.
1630+
1631+Alternatively, you may set the environment variables GTK2_ENGINE_CFLAGS
1632+and GTK2_ENGINE_LIBS to avoid the need to call pkg-config.
1633+See the pkg-config man page for more details.
1634+
1635+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
1636+See \`config.log' for more details" "$LINENO" 5; }
1637+else
1638+ GTK2_ENGINE_CFLAGS=$pkg_cv_GTK2_ENGINE_CFLAGS
1639+ GTK2_ENGINE_LIBS=$pkg_cv_GTK2_ENGINE_LIBS
1640+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
1641+$as_echo "yes" >&6; }
1642+
1643+fi
1644+fi
1645
1646 GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable glib_compile_resources gio-2.0`
1647
1648@@ -14038,7 +14211,7 @@
1649 ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}"
1650
1651
1652-ac_config_files="$ac_config_files Makefile themes/Makefile themes/Adwaita/Makefile themes/Adwaita/backgrounds/Makefile themes/Adwaita/cursors/Makefile themes/Adwaita/gtk-2.0/Makefile themes/Adwaita/gtk-3.0/Makefile themes/Adwaita/gtk-3.0/assets/Makefile themes/Adwaita/gtk-3.0/borders/Makefile themes/Adwaita/metacity-1/Makefile themes/HighContrast/Makefile themes/HighContrast/gtk-2.0/Makefile themes/HighContrast/gtk-3.0/Makefile themes/HighContrast/icons/Makefile src/Makefile po/Makefile.in"
1653+ac_config_files="$ac_config_files Makefile themes/Makefile themes/Adwaita/Makefile themes/Adwaita/backgrounds/Makefile themes/Adwaita/cursors/Makefile themes/Adwaita/gtk-2.0/Makefile themes/Adwaita/gtk-3.0/Makefile themes/Adwaita/gtk-3.0/assets/Makefile themes/Adwaita/gtk-3.0/borders/Makefile themes/Adwaita/metacity-1/Makefile themes/HighContrast/Makefile themes/HighContrast/gtk-2.0/Makefile themes/HighContrast/gtk-3.0/Makefile themes/HighContrast/icons/Makefile themes/HighContrast/metacity-1/Makefile po/Makefile.in"
1654
1655
1656 cat >confcache <<\_ACEOF
1657@@ -14214,8 +14387,12 @@
1658 ac_config_commands="$ac_config_commands po/stamp-it"
1659
1660
1661-if test -z "${GTK3_TRUE}" && test -z "${GTK3_FALSE}"; then
1662- as_fn_error $? "conditional \"GTK3\" was never defined.
1663+if test -z "${GTK3_ENGINE_TRUE}" && test -z "${GTK3_ENGINE_FALSE}"; then
1664+ as_fn_error $? "conditional \"GTK3_ENGINE\" was never defined.
1665+Usually this means the macro was only invoked conditionally." "$LINENO" 5
1666+fi
1667+if test -z "${GTK2_ENGINE_TRUE}" && test -z "${GTK2_ENGINE_FALSE}"; then
1668+ as_fn_error $? "conditional \"GTK2_ENGINE\" was never defined.
1669 Usually this means the macro was only invoked conditionally." "$LINENO" 5
1670 fi
1671 if test -z "${PLACEHOLDERS_TRUE}" && test -z "${PLACEHOLDERS_FALSE}"; then
1672@@ -14619,7 +14796,7 @@
1673 # report actual input values of CONFIG_FILES etc. instead of their
1674 # values after options handling.
1675 ac_log="
1676-This file was extended by gnome-themes-standard $as_me 3.6.0.2, which was
1677+This file was extended by gnome-themes-standard $as_me 3.7.2, which was
1678 generated by GNU Autoconf 2.69. Invocation command line was
1679
1680 CONFIG_FILES = $CONFIG_FILES
1681@@ -14676,7 +14853,7 @@
1682 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
1683 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
1684 ac_cs_version="\\
1685-gnome-themes-standard config.status 3.6.0.2
1686+gnome-themes-standard config.status 3.7.2
1687 configured by $0, generated by GNU Autoconf 2.69,
1688 with options \\"\$ac_cs_config\\"
1689
1690@@ -15091,7 +15268,7 @@
1691 "themes/HighContrast/gtk-2.0/Makefile") CONFIG_FILES="$CONFIG_FILES themes/HighContrast/gtk-2.0/Makefile" ;;
1692 "themes/HighContrast/gtk-3.0/Makefile") CONFIG_FILES="$CONFIG_FILES themes/HighContrast/gtk-3.0/Makefile" ;;
1693 "themes/HighContrast/icons/Makefile") CONFIG_FILES="$CONFIG_FILES themes/HighContrast/icons/Makefile" ;;
1694- "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
1695+ "themes/HighContrast/metacity-1/Makefile") CONFIG_FILES="$CONFIG_FILES themes/HighContrast/metacity-1/Makefile" ;;
1696 "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
1697 "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
1698
1699
1700=== modified file 'configure.ac'
1701--- configure.ac 2012-10-02 00:58:28 +0000
1702+++ configure.ac 2012-11-22 00:35:57 +0000
1703@@ -1,10 +1,11 @@
1704 dnl Process this file with autoconf to produce a configure script.
1705 AC_PREREQ(2.53)
1706
1707-AC_INIT([gnome-themes-standard], [3.6.0.2],
1708+AC_INIT([gnome-themes-standard], [3.7.2],
1709 [http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-themes-standard])
1710
1711 AM_INIT_AUTOMAKE([1.9 tar-ustar foreign dist-xz no-dist-gzip])
1712+m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
1713
1714 PKG_PROG_PKG_CONFIG([0.19])
1715
1716@@ -28,25 +29,39 @@
1717 AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package])
1718 AM_GLIB_GNU_GETTEXT
1719
1720-AC_ARG_ENABLE([gtk3-engines],
1721- AC_HELP_STRING([--disable-gtk3-engines],
1722- [Disable Gtk+ 3.x engines [default=no]]),
1723- enable_gtk3=$enableval,
1724- enable_gtk3=yes)
1725-AC_MSG_CHECKING([building gtk3 engines])
1726-AM_CONDITIONAL(GTK3, test "x$enable_gtk3" = "xyes")
1727-AC_MSG_RESULT([$enable_gtk3])
1728+AC_ARG_ENABLE([gtk3-engine],
1729+ AC_HELP_STRING([--disable-gtk3-engine],
1730+ [Disable Gtk+ 3.x engine [default=no]]),
1731+ enable_gtk3_engine=$enableval,
1732+ enable_gtk3_engine=yes)
1733+AC_MSG_CHECKING([building gtk3 engine])
1734+AM_CONDITIONAL(GTK3_ENGINE, test "x$enable_gtk3_engine" = "xyes")
1735+AC_MSG_RESULT([$enable_gtk3_engine])
1736+
1737 GTK_VERSION_REQUIRED=3.5.17
1738-
1739-if test "x$enable_gtk3" = "xyes"; then
1740- PKG_CHECK_MODULES([DEPENDENCIES], [gtk+-3.0 >= $GTK_VERSION_REQUIRED librsvg-2.0])
1741+if test "x$enable_gtk3_engine" = "xyes"; then
1742+ PKG_CHECK_MODULES([GTK3_ENGINE], [gtk+-3.0 >= $GTK_VERSION_REQUIRED librsvg-2.0])
1743 PKG_CHECK_MODULES([HIGHCONTRAST], [cairo gio-2.0 gdk-pixbuf-2.0 gdk-3.0])
1744 fi
1745-AC_SUBST(DEPENDENCIES_CFLAGS)
1746-AC_SUBST(DEPENDENCIES_LIBS)
1747-
1748-GTK_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-3.0`
1749-AC_SUBST(GTK_VERSION)
1750+
1751+GTK3_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-3.0`
1752+AC_SUBST(GTK3_VERSION)
1753+
1754+GTK2_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0`
1755+AC_SUBST(GTK2_VERSION)
1756+
1757+AC_ARG_ENABLE([gtk2-engine],
1758+ AC_HELP_STRING([--disable-gtk2-engine],
1759+ [Disable Gtk+-2 engine [default=no]]),
1760+ enable_gtk2_engine=$enableval,
1761+ enable_gtk2_engine=yes)
1762+AC_MSG_CHECKING([building gtk2 engine])
1763+AM_CONDITIONAL(GTK2_ENGINE, test "x$enable_gtk2_engine" = "xyes")
1764+AC_MSG_RESULT([$enable_gtk2_engine])
1765+
1766+if test "x$enable_gtk2_engine" = "xyes"; then
1767+ PKG_CHECK_MODULES([GTK2_ENGINE], [gtk+-2.0 gdk-2.0])
1768+fi
1769
1770 GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable glib_compile_resources gio-2.0`
1771 AC_SUBST(GLIB_COMPILE_RESOURCES)
1772@@ -59,9 +74,9 @@
1773 enable_placeholders=no)
1774 AM_CONDITIONAL(PLACEHOLDERS, test "x$enable_placeholders" != "xno")
1775
1776-AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, gtk-update-icon-cache-3.0)
1777+AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, gtk-update-icon-cache)
1778 if test -z "$GTK_UPDATE_ICON_CACHE"; then
1779- AC_MSG_ERROR([Could not find gtk-update-icon-cache-3.0])
1780+ AC_MSG_ERROR([Could not find gtk-update-icon-cache])
1781 fi
1782
1783 # Workaround to make aclocal get the right flags
1784@@ -78,27 +93,11 @@
1785 themes/Adwaita/gtk-3.0/assets/Makefile
1786 themes/Adwaita/gtk-3.0/borders/Makefile
1787 themes/Adwaita/metacity-1/Makefile
1788-themes/LowContrast/Makefile
1789-themes/LowContrast/gtk-2.0/Makefile
1790-themes/LowContrast/gtk-3.0/Makefile
1791-themes/LowContrast/icons/Makefile
1792-themes/LowContrast/icons/48x48/Makefile
1793-themes/LowContrast/icons/48x48/actions/Makefile
1794-themes/LowContrast/icons/48x48/apps/Makefile
1795-themes/LowContrast/icons/48x48/categories/Makefile
1796-themes/LowContrast/icons/48x48/devices/Makefile
1797-themes/LowContrast/icons/48x48/stock/Makefile
1798 themes/HighContrast/Makefile
1799 themes/HighContrast/gtk-2.0/Makefile
1800 themes/HighContrast/gtk-3.0/Makefile
1801 themes/HighContrast/icons/Makefile
1802-themes/HighContrastInverse/Makefile
1803-themes/HighContrastInverse/gtk-2.0/Makefile
1804-themes/HighContrastInverse/gtk-3.0/Makefile
1805-themes/HighContrastInverse/icons/Makefile
1806-themes/HighContrastInverse/icons/48x48/Makefile
1807-themes/HighContrastInverse/icons/48x48/stock/Makefile
1808-src/Makefile
1809+themes/HighContrast/metacity-1/Makefile
1810 po/Makefile.in
1811 ])
1812
1813
1814=== modified file 'debian/changelog'
1815--- debian/changelog 2012-11-12 13:01:00 +0000
1816+++ debian/changelog 2012-11-22 00:35:57 +0000
1817@@ -1,3 +1,9 @@
1818+gnome-themes-standard (3.7.2-0ubuntu2) raring; urgency=low
1819+
1820+ * New upstream release.
1821+
1822+ -- Benjamin Kerensa <bkerensa@ubuntu.com> Wed, 21 Nov 2012 16:31:45 -0800
1823+
1824 gnome-themes-standard (3.6.0.2-0ubuntu2) raring; urgency=low
1825
1826 * Install GTK+ module into Multi-Arch directory. We've dropped the fallback
1827
1828=== removed directory 'src'
1829=== removed file 'src/Makefile.am'
1830--- src/Makefile.am 2012-06-06 14:13:08 +0000
1831+++ src/Makefile.am 1970-01-01 00:00:00 +0000
1832@@ -1,24 +0,0 @@
1833-enginedir = $(libdir)/gtk-3.0/$(GTK_VERSION)/theming-engines
1834-
1835-engine_LTLIBRARIES =
1836-if GTK3
1837-engine_LTLIBRARIES += libadwaita.la
1838-endif
1839-
1840-assetsdir = $(datadir)/themes/Adwaita/gtk-3.0/assets
1841-
1842-INCLUDES = \
1843- -DASSETS_DIR=\""$(assetsdir)"\" \
1844- $(DEPENDENCIES_CFLAGS)
1845-
1846-libadwaita_la_SOURCES = \
1847- adwaita_utils.h \
1848- adwaita_utils.c \
1849- adwaita_engine.c
1850-
1851-libadwaita_la_LDFLAGS = -module -avoid-version -no-undefined -export-symbols $(top_srcdir)/src/engine.symbols
1852-libadwaita_la_LIBADD = $(DEPENDENCIES_LIBS)
1853-
1854-EXTRA_DIST = engine.symbols
1855-
1856--include $(top_srcdir)/git.mk
1857
1858=== removed file 'src/Makefile.in'
1859--- src/Makefile.in 2012-08-08 11:44:00 +0000
1860+++ src/Makefile.in 1970-01-01 00:00:00 +0000
1861@@ -1,632 +0,0 @@
1862-# Makefile.in generated by automake 1.12.2 from Makefile.am.
1863-# @configure_input@
1864-
1865-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
1866-
1867-# This Makefile.in is free software; the Free Software Foundation
1868-# gives unlimited permission to copy and/or distribute it,
1869-# with or without modifications, as long as this notice is preserved.
1870-
1871-# This program is distributed in the hope that it will be useful,
1872-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
1873-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
1874-# PARTICULAR PURPOSE.
1875-
1876-@SET_MAKE@
1877-
1878-VPATH = @srcdir@
1879-am__make_dryrun = \
1880- { \
1881- am__dry=no; \
1882- case $$MAKEFLAGS in \
1883- *\\[\ \ ]*) \
1884- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
1885- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
1886- *) \
1887- for am__flg in $$MAKEFLAGS; do \
1888- case $$am__flg in \
1889- *=*|--*) ;; \
1890- *n*) am__dry=yes; break;; \
1891- esac; \
1892- done;; \
1893- esac; \
1894- test $$am__dry = yes; \
1895- }
1896-pkgdatadir = $(datadir)/@PACKAGE@
1897-pkgincludedir = $(includedir)/@PACKAGE@
1898-pkglibdir = $(libdir)/@PACKAGE@
1899-pkglibexecdir = $(libexecdir)/@PACKAGE@
1900-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
1901-install_sh_DATA = $(install_sh) -c -m 644
1902-install_sh_PROGRAM = $(install_sh) -c
1903-install_sh_SCRIPT = $(install_sh) -c
1904-INSTALL_HEADER = $(INSTALL_DATA)
1905-transform = $(program_transform_name)
1906-NORMAL_INSTALL = :
1907-PRE_INSTALL = :
1908-POST_INSTALL = :
1909-NORMAL_UNINSTALL = :
1910-PRE_UNINSTALL = :
1911-POST_UNINSTALL = :
1912-build_triplet = @build@
1913-host_triplet = @host@
1914-@GTK3_TRUE@am__append_1 = libadwaita.la
1915-subdir = src
1916-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
1917- $(top_srcdir)/depcomp $(top_srcdir)/mkinstalldirs
1918-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
1919-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
1920-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
1921- $(ACLOCAL_M4)
1922-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
1923-CONFIG_CLEAN_FILES =
1924-CONFIG_CLEAN_VPATH_FILES =
1925-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
1926-am__vpath_adj = case $$p in \
1927- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
1928- *) f=$$p;; \
1929- esac;
1930-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
1931-am__install_max = 40
1932-am__nobase_strip_setup = \
1933- srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
1934-am__nobase_strip = \
1935- for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
1936-am__nobase_list = $(am__nobase_strip_setup); \
1937- for p in $$list; do echo "$$p $$p"; done | \
1938- sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
1939- $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
1940- if (++n[$$2] == $(am__install_max)) \
1941- { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
1942- END { for (dir in files) print dir, files[dir] }'
1943-am__base_list = \
1944- sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
1945- sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
1946-am__uninstall_files_from_dir = { \
1947- test -z "$$files" \
1948- || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
1949- || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
1950- $(am__cd) "$$dir" && rm -f $$files; }; \
1951- }
1952-am__installdirs = "$(DESTDIR)$(enginedir)"
1953-LTLIBRARIES = $(engine_LTLIBRARIES)
1954-am__DEPENDENCIES_1 =
1955-libadwaita_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
1956-am_libadwaita_la_OBJECTS = adwaita_utils.lo adwaita_engine.lo
1957-libadwaita_la_OBJECTS = $(am_libadwaita_la_OBJECTS)
1958-libadwaita_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
1959- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
1960- $(libadwaita_la_LDFLAGS) $(LDFLAGS) -o $@
1961-@GTK3_TRUE@am_libadwaita_la_rpath = -rpath $(enginedir)
1962-DEFAULT_INCLUDES = -I.@am__isrc@
1963-depcomp = $(SHELL) $(top_srcdir)/depcomp
1964-am__depfiles_maybe = depfiles
1965-am__mv = mv -f
1966-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
1967- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
1968-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
1969- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
1970- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
1971-CCLD = $(CC)
1972-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
1973- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
1974- $(LDFLAGS) -o $@
1975-SOURCES = $(libadwaita_la_SOURCES)
1976-DIST_SOURCES = $(libadwaita_la_SOURCES)
1977-am__can_run_installinfo = \
1978- case $$AM_UPDATE_INFO_DIR in \
1979- n|no|NO) false;; \
1980- *) (install-info --version) >/dev/null 2>&1;; \
1981- esac
1982-ETAGS = etags
1983-CTAGS = ctags
1984-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
1985-ACLOCAL = @ACLOCAL@
1986-ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
1987-ALL_LINGUAS = @ALL_LINGUAS@
1988-AMTAR = @AMTAR@
1989-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
1990-AR = @AR@
1991-AS = @AS@
1992-AUTOCONF = @AUTOCONF@
1993-AUTOHEADER = @AUTOHEADER@
1994-AUTOMAKE = @AUTOMAKE@
1995-AWK = @AWK@
1996-CATALOGS = @CATALOGS@
1997-CATOBJEXT = @CATOBJEXT@
1998-CC = @CC@
1999-CCDEPMODE = @CCDEPMODE@
2000-CFLAGS = @CFLAGS@
2001-CPP = @CPP@
2002-CPPFLAGS = @CPPFLAGS@
2003-CYGPATH_W = @CYGPATH_W@
2004-DATADIRNAME = @DATADIRNAME@
2005-DEFS = @DEFS@
2006-DEPDIR = @DEPDIR@
2007-DEPENDENCIES_CFLAGS = @DEPENDENCIES_CFLAGS@
2008-DEPENDENCIES_LIBS = @DEPENDENCIES_LIBS@
2009-DLLTOOL = @DLLTOOL@
2010-DSYMUTIL = @DSYMUTIL@
2011-DUMPBIN = @DUMPBIN@
2012-ECHO_C = @ECHO_C@
2013-ECHO_N = @ECHO_N@
2014-ECHO_T = @ECHO_T@
2015-EGREP = @EGREP@
2016-EXEEXT = @EXEEXT@
2017-FGREP = @FGREP@
2018-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
2019-GLIB_CFLAGS = @GLIB_CFLAGS@
2020-GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
2021-GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
2022-GLIB_LIBS = @GLIB_LIBS@
2023-GLIB_MKENUMS = @GLIB_MKENUMS@
2024-GMOFILES = @GMOFILES@
2025-GMSGFMT = @GMSGFMT@
2026-GOBJECT_QUERY = @GOBJECT_QUERY@
2027-GREP = @GREP@
2028-GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
2029-GTK_VERSION = @GTK_VERSION@
2030-HIGHCONTRAST_CFLAGS = @HIGHCONTRAST_CFLAGS@
2031-HIGHCONTRAST_LIBS = @HIGHCONTRAST_LIBS@
2032-INSTALL = @INSTALL@
2033-INSTALL_DATA = @INSTALL_DATA@
2034-INSTALL_PROGRAM = @INSTALL_PROGRAM@
2035-INSTALL_SCRIPT = @INSTALL_SCRIPT@
2036-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
2037-INSTOBJEXT = @INSTOBJEXT@
2038-INTLLIBS = @INTLLIBS@
2039-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
2040-INTLTOOL_MERGE = @INTLTOOL_MERGE@
2041-INTLTOOL_PERL = @INTLTOOL_PERL@
2042-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
2043-INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
2044-INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
2045-INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
2046-INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
2047-LD = @LD@
2048-LDFLAGS = @LDFLAGS@
2049-LIBOBJS = @LIBOBJS@
2050-LIBS = @LIBS@
2051-LIBTOOL = @LIBTOOL@
2052-LIPO = @LIPO@
2053-LN_S = @LN_S@
2054-LTLIBOBJS = @LTLIBOBJS@
2055-MAKEINFO = @MAKEINFO@
2056-MANIFEST_TOOL = @MANIFEST_TOOL@
2057-MKDIR_P = @MKDIR_P@
2058-MKINSTALLDIRS = @MKINSTALLDIRS@
2059-MSGFMT = @MSGFMT@
2060-MSGFMT_OPTS = @MSGFMT_OPTS@
2061-MSGMERGE = @MSGMERGE@
2062-NM = @NM@
2063-NMEDIT = @NMEDIT@
2064-OBJDUMP = @OBJDUMP@
2065-OBJEXT = @OBJEXT@
2066-OTOOL = @OTOOL@
2067-OTOOL64 = @OTOOL64@
2068-PACKAGE = @PACKAGE@
2069-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
2070-PACKAGE_NAME = @PACKAGE_NAME@
2071-PACKAGE_STRING = @PACKAGE_STRING@
2072-PACKAGE_TARNAME = @PACKAGE_TARNAME@
2073-PACKAGE_URL = @PACKAGE_URL@
2074-PACKAGE_VERSION = @PACKAGE_VERSION@
2075-PATH_SEPARATOR = @PATH_SEPARATOR@
2076-PKG_CONFIG = @PKG_CONFIG@
2077-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
2078-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
2079-POFILES = @POFILES@
2080-POSUB = @POSUB@
2081-PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
2082-PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
2083-RANLIB = @RANLIB@
2084-SED = @SED@
2085-SET_MAKE = @SET_MAKE@
2086-SHELL = @SHELL@
2087-STRIP = @STRIP@
2088-USE_NLS = @USE_NLS@
2089-VERSION = @VERSION@
2090-XGETTEXT = @XGETTEXT@
2091-abs_builddir = @abs_builddir@
2092-abs_srcdir = @abs_srcdir@
2093-abs_top_builddir = @abs_top_builddir@
2094-abs_top_srcdir = @abs_top_srcdir@
2095-ac_ct_AR = @ac_ct_AR@
2096-ac_ct_CC = @ac_ct_CC@
2097-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
2098-am__include = @am__include@
2099-am__leading_dot = @am__leading_dot@
2100-am__quote = @am__quote@
2101-am__tar = @am__tar@
2102-am__untar = @am__untar@
2103-bindir = @bindir@
2104-build = @build@
2105-build_alias = @build_alias@
2106-build_cpu = @build_cpu@
2107-build_os = @build_os@
2108-build_vendor = @build_vendor@
2109-builddir = @builddir@
2110-datadir = @datadir@
2111-datarootdir = @datarootdir@
2112-docdir = @docdir@
2113-dvidir = @dvidir@
2114-exec_prefix = @exec_prefix@
2115-host = @host@
2116-host_alias = @host_alias@
2117-host_cpu = @host_cpu@
2118-host_os = @host_os@
2119-host_vendor = @host_vendor@
2120-htmldir = @htmldir@
2121-includedir = @includedir@
2122-infodir = @infodir@
2123-install_sh = @install_sh@
2124-intltool__v_merge_options_ = @intltool__v_merge_options_@
2125-intltool__v_merge_options_0 = @intltool__v_merge_options_0@
2126-libdir = @libdir@
2127-libexecdir = @libexecdir@
2128-localedir = @localedir@
2129-localstatedir = @localstatedir@
2130-mandir = @mandir@
2131-mkdir_p = @mkdir_p@
2132-oldincludedir = @oldincludedir@
2133-pdfdir = @pdfdir@
2134-prefix = @prefix@
2135-program_transform_name = @program_transform_name@
2136-psdir = @psdir@
2137-sbindir = @sbindir@
2138-sharedstatedir = @sharedstatedir@
2139-srcdir = @srcdir@
2140-sysconfdir = @sysconfdir@
2141-target_alias = @target_alias@
2142-top_build_prefix = @top_build_prefix@
2143-top_builddir = @top_builddir@
2144-top_srcdir = @top_srcdir@
2145-enginedir = $(libdir)/gtk-3.0/$(GTK_VERSION)/theming-engines
2146-engine_LTLIBRARIES = $(am__append_1)
2147-assetsdir = $(datadir)/themes/Adwaita/gtk-3.0/assets
2148-INCLUDES = \
2149- -DASSETS_DIR=\""$(assetsdir)"\" \
2150- $(DEPENDENCIES_CFLAGS)
2151-
2152-libadwaita_la_SOURCES = \
2153- adwaita_utils.h \
2154- adwaita_utils.c \
2155- adwaita_engine.c
2156-
2157-libadwaita_la_LDFLAGS = -module -avoid-version -no-undefined -export-symbols $(top_srcdir)/src/engine.symbols
2158-libadwaita_la_LIBADD = $(DEPENDENCIES_LIBS)
2159-EXTRA_DIST = engine.symbols
2160-all: all-am
2161-
2162-.SUFFIXES:
2163-.SUFFIXES: .c .lo .o .obj
2164-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
2165- @for dep in $?; do \
2166- case '$(am__configure_deps)' in \
2167- *$$dep*) \
2168- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
2169- && { if test -f $@; then exit 0; else break; fi; }; \
2170- exit 1;; \
2171- esac; \
2172- done; \
2173- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \
2174- $(am__cd) $(top_srcdir) && \
2175- $(AUTOMAKE) --foreign src/Makefile
2176-.PRECIOUS: Makefile
2177-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
2178- @case '$?' in \
2179- *config.status*) \
2180- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
2181- *) \
2182- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
2183- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
2184- esac;
2185-
2186-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
2187- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
2188-
2189-$(top_srcdir)/configure: $(am__configure_deps)
2190- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
2191-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
2192- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
2193-$(am__aclocal_m4_deps):
2194-install-engineLTLIBRARIES: $(engine_LTLIBRARIES)
2195- @$(NORMAL_INSTALL)
2196- @list='$(engine_LTLIBRARIES)'; test -n "$(enginedir)" || list=; \
2197- list2=; for p in $$list; do \
2198- if test -f $$p; then \
2199- list2="$$list2 $$p"; \
2200- else :; fi; \
2201- done; \
2202- test -z "$$list2" || { \
2203- echo " $(MKDIR_P) '$(DESTDIR)$(enginedir)'"; \
2204- $(MKDIR_P) "$(DESTDIR)$(enginedir)" || exit 1; \
2205- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(enginedir)'"; \
2206- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(enginedir)"; \
2207- }
2208-
2209-uninstall-engineLTLIBRARIES:
2210- @$(NORMAL_UNINSTALL)
2211- @list='$(engine_LTLIBRARIES)'; test -n "$(enginedir)" || list=; \
2212- for p in $$list; do \
2213- $(am__strip_dir) \
2214- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(enginedir)/$$f'"; \
2215- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(enginedir)/$$f"; \
2216- done
2217-
2218-clean-engineLTLIBRARIES:
2219- -test -z "$(engine_LTLIBRARIES)" || rm -f $(engine_LTLIBRARIES)
2220- @list='$(engine_LTLIBRARIES)'; \
2221- locs=`for p in $$list; do echo $$p; done | \
2222- sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
2223- sort -u`; \
2224- test -z "$$locs" || { \
2225- echo rm -f $${locs}; \
2226- rm -f $${locs}; \
2227- }
2228-libadwaita.la: $(libadwaita_la_OBJECTS) $(libadwaita_la_DEPENDENCIES) $(EXTRA_libadwaita_la_DEPENDENCIES)
2229- $(libadwaita_la_LINK) $(am_libadwaita_la_rpath) $(libadwaita_la_OBJECTS) $(libadwaita_la_LIBADD) $(LIBS)
2230-
2231-mostlyclean-compile:
2232- -rm -f *.$(OBJEXT)
2233-
2234-distclean-compile:
2235- -rm -f *.tab.c
2236-
2237-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/adwaita_engine.Plo@am__quote@
2238-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/adwaita_utils.Plo@am__quote@
2239-
2240-.c.o:
2241-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
2242-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
2243-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
2244-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2245-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
2246-
2247-.c.obj:
2248-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
2249-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
2250-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
2251-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2252-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
2253-
2254-.c.lo:
2255-@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
2256-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
2257-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
2258-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2259-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
2260-
2261-mostlyclean-libtool:
2262- -rm -f *.lo
2263-
2264-clean-libtool:
2265- -rm -rf .libs _libs
2266-
2267-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
2268- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
2269- unique=`for i in $$list; do \
2270- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
2271- done | \
2272- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
2273- END { if (nonempty) { for (i in files) print i; }; }'`; \
2274- mkid -fID $$unique
2275-tags: TAGS
2276-
2277-TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
2278- $(TAGS_FILES) $(LISP)
2279- set x; \
2280- here=`pwd`; \
2281- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
2282- unique=`for i in $$list; do \
2283- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
2284- done | \
2285- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
2286- END { if (nonempty) { for (i in files) print i; }; }'`; \
2287- shift; \
2288- if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
2289- test -n "$$unique" || unique=$$empty_fix; \
2290- if test $$# -gt 0; then \
2291- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
2292- "$$@" $$unique; \
2293- else \
2294- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
2295- $$unique; \
2296- fi; \
2297- fi
2298-ctags: CTAGS
2299-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
2300- $(TAGS_FILES) $(LISP)
2301- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
2302- unique=`for i in $$list; do \
2303- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
2304- done | \
2305- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
2306- END { if (nonempty) { for (i in files) print i; }; }'`; \
2307- test -z "$(CTAGS_ARGS)$$unique" \
2308- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
2309- $$unique
2310-
2311-GTAGS:
2312- here=`$(am__cd) $(top_builddir) && pwd` \
2313- && $(am__cd) $(top_srcdir) \
2314- && gtags -i $(GTAGS_ARGS) "$$here"
2315-
2316-cscopelist: $(HEADERS) $(SOURCES) $(LISP)
2317- list='$(SOURCES) $(HEADERS) $(LISP)'; \
2318- case "$(srcdir)" in \
2319- [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
2320- *) sdir=$(subdir)/$(srcdir) ;; \
2321- esac; \
2322- for i in $$list; do \
2323- if test -f "$$i"; then \
2324- echo "$(subdir)/$$i"; \
2325- else \
2326- echo "$$sdir/$$i"; \
2327- fi; \
2328- done >> $(top_builddir)/cscope.files
2329-
2330-distclean-tags:
2331- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
2332-
2333-distdir: $(DISTFILES)
2334- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
2335- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
2336- list='$(DISTFILES)'; \
2337- dist_files=`for file in $$list; do echo $$file; done | \
2338- sed -e "s|^$$srcdirstrip/||;t" \
2339- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
2340- case $$dist_files in \
2341- */*) $(MKDIR_P) `echo "$$dist_files" | \
2342- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
2343- sort -u` ;; \
2344- esac; \
2345- for file in $$dist_files; do \
2346- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
2347- if test -d $$d/$$file; then \
2348- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
2349- if test -d "$(distdir)/$$file"; then \
2350- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
2351- fi; \
2352- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
2353- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
2354- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
2355- fi; \
2356- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
2357- else \
2358- test -f "$(distdir)/$$file" \
2359- || cp -p $$d/$$file "$(distdir)/$$file" \
2360- || exit 1; \
2361- fi; \
2362- done
2363-check-am: all-am
2364-check: check-am
2365-all-am: Makefile $(LTLIBRARIES)
2366-installdirs:
2367- for dir in "$(DESTDIR)$(enginedir)"; do \
2368- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
2369- done
2370-install: install-am
2371-install-exec: install-exec-am
2372-install-data: install-data-am
2373-uninstall: uninstall-am
2374-
2375-install-am: all-am
2376- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
2377-
2378-installcheck: installcheck-am
2379-install-strip:
2380- if test -z '$(STRIP)'; then \
2381- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
2382- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
2383- install; \
2384- else \
2385- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
2386- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
2387- "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
2388- fi
2389-mostlyclean-generic:
2390-
2391-clean-generic:
2392-
2393-distclean-generic:
2394- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
2395- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
2396-
2397-maintainer-clean-generic:
2398- @echo "This command is intended for maintainers to use"
2399- @echo "it deletes files that may require special tools to rebuild."
2400-clean: clean-am
2401-
2402-clean-am: clean-engineLTLIBRARIES clean-generic clean-libtool \
2403- mostlyclean-am
2404-
2405-distclean: distclean-am
2406- -rm -rf ./$(DEPDIR)
2407- -rm -f Makefile
2408-distclean-am: clean-am distclean-compile distclean-generic \
2409- distclean-tags
2410-
2411-dvi: dvi-am
2412-
2413-dvi-am:
2414-
2415-html: html-am
2416-
2417-html-am:
2418-
2419-info: info-am
2420-
2421-info-am:
2422-
2423-install-data-am: install-engineLTLIBRARIES
2424-
2425-install-dvi: install-dvi-am
2426-
2427-install-dvi-am:
2428-
2429-install-exec-am:
2430-
2431-install-html: install-html-am
2432-
2433-install-html-am:
2434-
2435-install-info: install-info-am
2436-
2437-install-info-am:
2438-
2439-install-man:
2440-
2441-install-pdf: install-pdf-am
2442-
2443-install-pdf-am:
2444-
2445-install-ps: install-ps-am
2446-
2447-install-ps-am:
2448-
2449-installcheck-am:
2450-
2451-maintainer-clean: maintainer-clean-am
2452- -rm -rf ./$(DEPDIR)
2453- -rm -f Makefile
2454-maintainer-clean-am: distclean-am maintainer-clean-generic
2455-
2456-mostlyclean: mostlyclean-am
2457-
2458-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
2459- mostlyclean-libtool
2460-
2461-pdf: pdf-am
2462-
2463-pdf-am:
2464-
2465-ps: ps-am
2466-
2467-ps-am:
2468-
2469-uninstall-am: uninstall-engineLTLIBRARIES
2470-
2471-.MAKE: install-am install-strip
2472-
2473-.PHONY: CTAGS GTAGS all all-am check check-am clean \
2474- clean-engineLTLIBRARIES clean-generic clean-libtool cscopelist \
2475- ctags distclean distclean-compile distclean-generic \
2476- distclean-libtool distclean-tags distdir dvi dvi-am html \
2477- html-am info info-am install install-am install-data \
2478- install-data-am install-dvi install-dvi-am \
2479- install-engineLTLIBRARIES install-exec install-exec-am \
2480- install-html install-html-am install-info install-info-am \
2481- install-man install-pdf install-pdf-am install-ps \
2482- install-ps-am install-strip installcheck installcheck-am \
2483- installdirs maintainer-clean maintainer-clean-generic \
2484- mostlyclean mostlyclean-compile mostlyclean-generic \
2485- mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
2486- uninstall-am uninstall-engineLTLIBRARIES
2487-
2488-
2489--include $(top_srcdir)/git.mk
2490-
2491-# Tell versions [3.59,3.63) of GNU make to not export all variables.
2492-# Otherwise a system limit (for SysV at least) may be exceeded.
2493-.NOEXPORT:
2494
2495=== removed file 'src/adwaita_engine.c'
2496--- src/adwaita_engine.c 2012-06-06 14:13:08 +0000
2497+++ src/adwaita_engine.c 1970-01-01 00:00:00 +0000
2498@@ -1,458 +0,0 @@
2499-/* Adwaita - a GTK+ engine
2500- *
2501- * Copyright (C) 2011 Carlos Garnacho <carlosg@gnome.org>
2502- * Copyright (C) 2011 Red Hat, Inc.
2503- *
2504- * This library is free software; you can redistribute it and/or
2505- * modify it under the terms of the GNU Lesser General Public
2506- * License as published by the Free Software Foundation; either
2507- * version 2.1 of the License, or (at your option) any later version.
2508- *
2509- * This library is distributed in the hope that it will be useful,
2510- * but WITHOUT ANY WARRANTY; without even the implied warranty of
2511- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
2512- * Lesser General Public License for more details.
2513- *
2514- * You should have received a copy of the GNU Lesser General Public
2515- * License along with this library; if not, write to the Free Software
2516- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
2517- *
2518- * Authors: Carlos Garnacho <carlosg@gnome.org>
2519- * Cosimo Cecchi <cosimoc@gnome.org>
2520- *
2521- * Project contact: <gnome-themes-list@gnome.org>
2522- */
2523-
2524-#include <gtk/gtk.h>
2525-#include <gmodule.h>
2526-#include <math.h>
2527-#include <cairo-gobject.h>
2528-
2529-#include "adwaita_utils.h"
2530-
2531-#define ADWAITA_NAMESPACE "adwaita"
2532-
2533-typedef struct _AdwaitaEngine AdwaitaEngine;
2534-typedef struct _AdwaitaEngineClass AdwaitaEngineClass;
2535-
2536-struct _AdwaitaEngine
2537-{
2538- GtkThemingEngine parent_object;
2539-};
2540-
2541-struct _AdwaitaEngineClass
2542-{
2543- GtkThemingEngineClass parent_class;
2544-};
2545-
2546-#define ADWAITA_TYPE_ENGINE (adwaita_engine_get_type ())
2547-#define ADWAITA_ENGINE(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), ADWAITA_TYPE_ENGINE, AdwaitaEngine))
2548-#define ADWAITA_ENGINE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ADWAITA_TYPE_ENGINE, AdwaitaEngineClass))
2549-#define ADWAITA_IS_ENGINE(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), ADWAITA_TYPE_ENGINE))
2550-#define ADWAITA_IS_ENGINE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ADWAITA_TYPE_ENGINE))
2551-#define ADWAITA_ENGINE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ADWAITA_TYPE_ENGINE, AdwaitaEngineClass))
2552-
2553-GType adwaita_engine_get_type (void) G_GNUC_CONST;
2554-void adwaita_engine_register_types (GTypeModule *module);
2555-
2556-G_DEFINE_DYNAMIC_TYPE (AdwaitaEngine, adwaita_engine, GTK_TYPE_THEMING_ENGINE)
2557-
2558-void
2559-adwaita_engine_register_types (GTypeModule *module)
2560-{
2561- adwaita_engine_register_type (module);
2562-}
2563-
2564-static void
2565-adwaita_engine_init (AdwaitaEngine *self)
2566-{
2567-}
2568-
2569-static void
2570-adwaita_engine_render_arrow (GtkThemingEngine *engine,
2571- cairo_t *cr,
2572- gdouble angle,
2573- gdouble x,
2574- gdouble y,
2575- gdouble size)
2576-{
2577- double line_width;
2578- GtkStateFlags state;
2579- GdkRGBA color;
2580-
2581- cairo_save (cr);
2582-
2583- line_width = size / 3.0 / sqrt (2);
2584- cairo_set_line_width (cr, line_width);
2585- cairo_set_line_join (cr, CAIRO_LINE_JOIN_ROUND);
2586- cairo_set_line_cap (cr, CAIRO_LINE_CAP_ROUND);
2587-
2588- cairo_translate (cr, x + size / 2.0, y + size / 2.0);
2589- cairo_rotate (cr, angle - G_PI_2);
2590- cairo_translate (cr, size / 4.0, 0);
2591-
2592- cairo_scale (cr,
2593- (size / (size + line_width)),
2594- (size / (size + line_width)));
2595-
2596- cairo_move_to (cr, -size / 2.0, -size / 2.0);
2597- cairo_rel_line_to (cr, size / 2.0, size / 2.0);
2598- cairo_rel_line_to (cr, - size / 2.0, size / 2.0);
2599-
2600- state = gtk_theming_engine_get_state (engine);
2601- gtk_theming_engine_get_color (engine, state, &color);
2602- gdk_cairo_set_source_rgba (cr, &color);
2603- cairo_stroke (cr);
2604-
2605- cairo_restore (cr);
2606-}
2607-
2608-static void
2609-adwaita_engine_render_focus (GtkThemingEngine *engine,
2610- cairo_t *cr,
2611- gdouble x,
2612- gdouble y,
2613- gdouble width,
2614- gdouble height)
2615-{
2616- GdkRGBA *border_color = NULL;
2617- GtkStateFlags state;
2618- gint line_width, focus_pad;
2619- gint border_radius;
2620- gboolean use_dashes;
2621- double dashes[2] = { 2.0, 0.2 };
2622- const GtkWidgetPath *path;
2623-
2624- path = gtk_theming_engine_get_path (engine);
2625- state = gtk_theming_engine_get_state (engine);
2626- gtk_theming_engine_get (engine, state,
2627- "-adwaita-focus-border-color", &border_color,
2628- "-adwaita-focus-border-radius", &border_radius,
2629- "-adwaita-focus-border-dashes", &use_dashes,
2630- NULL);
2631-
2632- gtk_theming_engine_get_style (engine,
2633- "focus-line-width", &line_width,
2634- "focus-padding", &focus_pad,
2635- NULL);
2636-
2637- /* as we render the tab smaller than the whole allocation, we need
2638- * to recenter and resize the focus on the tab.
2639- */
2640- if (gtk_theming_engine_has_class (engine, GTK_STYLE_CLASS_NOTEBOOK) &&
2641- gtk_theming_engine_has_region (engine, GTK_STYLE_REGION_TAB, NULL))
2642- {
2643- y += 3.0;
2644- height -= 3.0;
2645- }
2646-
2647- /* the treeview rows don't change allocation when modifying focus-padding,
2648- * so we have to move the focus ring inside the allocated area manually.
2649- */
2650- if (gtk_widget_path_is_type (path, GTK_TYPE_TREE_VIEW))
2651- {
2652- x += focus_pad;
2653- y += focus_pad;
2654- width -= 2 * focus_pad;
2655- height -= 2 * focus_pad;
2656- }
2657-
2658- cairo_save (cr);
2659- cairo_set_line_width (cr, line_width);
2660-
2661- if (line_width > 1)
2662- _cairo_round_rectangle_sides (cr, border_radius,
2663- x, y, width, height,
2664- SIDE_ALL, GTK_JUNCTION_NONE);
2665- else
2666- _cairo_round_rectangle_sides (cr, border_radius,
2667- x + 0.5, y + 0.5,
2668- width - 1, height - 1,
2669- SIDE_ALL, GTK_JUNCTION_NONE);
2670-
2671- if (use_dashes)
2672- cairo_set_dash (cr, dashes, 1, 0.0);
2673-
2674- if (border_color != NULL)
2675- gdk_cairo_set_source_rgba (cr, border_color);
2676-
2677- cairo_stroke (cr);
2678- cairo_restore (cr);
2679-
2680- if (border_color != NULL)
2681- gdk_rgba_free (border_color);
2682-}
2683-
2684-#define NOTEBOOK_TAB_TOP_MARGIN 3.0
2685-
2686-static void
2687-draw_tab_shape (cairo_t *cr,
2688- gdouble curve_width,
2689- gdouble x,
2690- gdouble y,
2691- gdouble width,
2692- gdouble height)
2693-{
2694- cairo_move_to (cr, x, height);
2695-
2696- cairo_arc (cr,
2697- x + curve_width, y + 3.0,
2698- 2.5,
2699- G_PI, G_PI + G_PI_2);
2700-
2701- cairo_arc (cr,
2702- x + width - curve_width, y + 3.0,
2703- 2.5,
2704- G_PI + G_PI_2, 2 * G_PI);
2705-
2706- cairo_line_to (cr, x + width, height);
2707-}
2708-
2709-static void
2710-render_notebook_extension (GtkThemingEngine *engine,
2711- cairo_t *cr,
2712- gdouble x,
2713- gdouble y,
2714- gdouble width,
2715- gdouble height,
2716- GtkPositionType gap_side)
2717-{
2718- gint tab_curvature, border_width;
2719- GdkRGBA border_color, background_color;
2720- GtkStateFlags state;
2721- gdouble angle = 0;
2722- cairo_pattern_t *pattern = NULL;
2723- gboolean is_active;
2724-
2725- gtk_theming_engine_get_style (engine,
2726- "tab-curvature", &tab_curvature,
2727- NULL);
2728- state = gtk_theming_engine_get_state (engine);
2729- gtk_theming_engine_get_background_color (engine, state, &background_color);
2730- gtk_theming_engine_get_border_color (engine, state, &border_color);
2731- gtk_theming_engine_get (engine, state,
2732- "-adwaita-border-gradient", &pattern,
2733- NULL);
2734-
2735- is_active = (state & GTK_STATE_FLAG_ACTIVE);
2736- border_width = 1.0;
2737-
2738- cairo_save (cr);
2739- cairo_set_line_width (cr, border_width);
2740-
2741- if (gap_side == GTK_POS_BOTTOM)
2742- x += border_width / 2;
2743- else if (gap_side == GTK_POS_TOP)
2744- x -= border_width / 2;
2745-
2746- if (gap_side == GTK_POS_TOP)
2747- {
2748- angle = G_PI;
2749- cairo_translate (cr, x + width, y + height - NOTEBOOK_TAB_TOP_MARGIN - border_width);
2750- }
2751- else
2752- {
2753- cairo_translate (cr, x, y + NOTEBOOK_TAB_TOP_MARGIN + border_width);
2754- }
2755-
2756- cairo_rotate (cr, angle);
2757-
2758- width -= border_width;
2759- height -= NOTEBOOK_TAB_TOP_MARGIN + border_width;
2760-
2761- /* draw the tab shape and clip the background inside it */
2762- cairo_save (cr);
2763- draw_tab_shape (cr, tab_curvature,
2764- 0, 0.5,
2765- width, is_active ? (height + 1.0) : (height));
2766- cairo_clip (cr);
2767-
2768- GTK_THEMING_ENGINE_CLASS (adwaita_engine_parent_class)->render_background
2769- (engine, cr, 0, 0.5,
2770- width, is_active ? (height + 1.0) : (height));
2771-
2772- cairo_restore (cr);
2773-
2774- /* now draw the border */
2775- draw_tab_shape (cr, tab_curvature,
2776- 0, 0,
2777- width, height);
2778-
2779- if (pattern && (state & GTK_STATE_FLAG_ACTIVE))
2780- {
2781- cairo_scale (cr, width, height);
2782- cairo_set_source (cr, pattern);
2783- cairo_scale (cr, 1.0 / width, 1.0 / height);
2784- }
2785- else
2786- {
2787- gdk_cairo_set_source_rgba (cr, &border_color);
2788- }
2789-
2790- cairo_stroke (cr);
2791-
2792- if (pattern != NULL)
2793- cairo_pattern_destroy (pattern);
2794-
2795- cairo_restore (cr);
2796-}
2797-
2798-static void
2799-adwaita_engine_render_extension (GtkThemingEngine *engine,
2800- cairo_t *cr,
2801- gdouble x,
2802- gdouble y,
2803- gdouble width,
2804- gdouble height,
2805- GtkPositionType gap_side)
2806-{
2807- if (gtk_theming_engine_has_class (engine, GTK_STYLE_CLASS_NOTEBOOK) &&
2808- ((gap_side == GTK_POS_TOP) || (gap_side == GTK_POS_BOTTOM)))
2809- {
2810- render_notebook_extension (engine, cr, x, y, width, height, gap_side);
2811- return;
2812- }
2813-
2814- GTK_THEMING_ENGINE_CLASS (adwaita_engine_parent_class)->render_extension
2815- (engine, cr,
2816- x, y, width, height,
2817- gap_side);
2818-}
2819-
2820-static void
2821-adwaita_engine_render_expander (GtkThemingEngine *engine,
2822- cairo_t *cr,
2823- gdouble x,
2824- gdouble y,
2825- gdouble width,
2826- gdouble height)
2827-{
2828- GdkRGBA fg;
2829- GtkStateFlags state;
2830- gdouble side, offset;
2831- gint line_width;
2832- GtkBorder border;
2833- const GtkWidgetPath *path = gtk_theming_engine_get_path (engine);
2834-
2835- side = floor (MIN (width, height));
2836-
2837- if (gtk_widget_path_is_type (path, GTK_TYPE_TREE_VIEW) &&
2838- (side == 17))
2839- {
2840- /* HACK: draw the expander as if it was 11px instead of the allocated 17px,
2841- * so that we can have a bit of padding between the view edge and the
2842- * expander itself.
2843- */
2844- x += 3;
2845- y += 3;
2846- width -= 6;
2847- height -= 6;
2848- side -= 6;
2849- }
2850-
2851- x += width / 2 - side / 2;
2852- y += height / 2 - side / 2;
2853-
2854- x = floor (x);
2855- y = floor (y);
2856-
2857- /* make sure the rendered side length is always odd */
2858- if (((gint) side % 2) == 0)
2859- side -= 1.0;
2860-
2861- GTK_THEMING_ENGINE_CLASS (adwaita_engine_parent_class)->render_background
2862- (engine, cr, x, y, side, side);
2863- GTK_THEMING_ENGINE_CLASS (adwaita_engine_parent_class)->render_frame
2864- (engine, cr, x, y, side, side);
2865-
2866- state = gtk_theming_engine_get_state (engine);
2867- gtk_theming_engine_get_color (engine, state, &fg);
2868- gtk_theming_engine_get_border (engine, state, &border);
2869-
2870- line_width = 1;
2871- offset = (1 + line_width / 2.0);
2872-
2873- cairo_save (cr);
2874-
2875- cairo_set_line_width (cr, line_width);
2876- cairo_set_line_cap (cr, CAIRO_LINE_CAP_ROUND);
2877- gdk_cairo_set_source_rgba (cr, &fg);
2878-
2879- cairo_move_to (cr,
2880- x + border.left + offset,
2881- y + side / 2);
2882- cairo_line_to (cr,
2883- x + side - (border.right + offset),
2884- y + side / 2);
2885-
2886- if ((state & GTK_STATE_FLAG_ACTIVE) == 0)
2887- {
2888- cairo_move_to (cr,
2889- x + side / 2,
2890- y + border.top + offset);
2891- cairo_line_to (cr,
2892- x + side / 2,
2893- y + side - (border.bottom + offset));
2894- }
2895-
2896- cairo_stroke (cr);
2897-
2898- cairo_restore (cr);
2899-}
2900-
2901-static void
2902-adwaita_engine_class_init (AdwaitaEngineClass *klass)
2903-{
2904- GtkThemingEngineClass *engine_class = GTK_THEMING_ENGINE_CLASS (klass);
2905-
2906- engine_class->render_arrow = adwaita_engine_render_arrow;
2907- engine_class->render_focus = adwaita_engine_render_focus;
2908- engine_class->render_extension = adwaita_engine_render_extension;
2909- engine_class->render_expander = adwaita_engine_render_expander;
2910-
2911- gtk_theming_engine_register_property (ADWAITA_NAMESPACE, NULL,
2912- g_param_spec_boxed ("focus-border-color",
2913- "Focus border color",
2914- "Focus border color",
2915- GDK_TYPE_RGBA, 0));
2916- gtk_theming_engine_register_property (ADWAITA_NAMESPACE, NULL,
2917- g_param_spec_int ("focus-border-radius",
2918- "Focus border radius",
2919- "Focus border radius",
2920- 0, G_MAXINT, 0,
2921- 0));
2922- gtk_theming_engine_register_property (ADWAITA_NAMESPACE, NULL,
2923- g_param_spec_boxed ("border-gradient",
2924- "Border gradient",
2925- "Border gradient",
2926- CAIRO_GOBJECT_TYPE_PATTERN, 0));
2927- gtk_theming_engine_register_property (ADWAITA_NAMESPACE, NULL,
2928- g_param_spec_boolean ("focus-border-dashes",
2929- "Focus border uses dashes",
2930- "Focus border uses dashes",
2931- FALSE, 0));
2932-}
2933-
2934-static void
2935-adwaita_engine_class_finalize (AdwaitaEngineClass *klass)
2936-{
2937-}
2938-
2939-G_MODULE_EXPORT void
2940-theme_init (GTypeModule *module)
2941-{
2942- adwaita_engine_register_types (module);
2943-}
2944-
2945-G_MODULE_EXPORT void
2946-theme_exit (void)
2947-{
2948-}
2949-
2950-G_MODULE_EXPORT GtkThemingEngine *
2951-create_engine (void)
2952-{
2953- return GTK_THEMING_ENGINE (g_object_new (ADWAITA_TYPE_ENGINE,
2954- "name", "adwaita",
2955- NULL));
2956-}
2957
2958=== removed file 'src/adwaita_utils.c'
2959--- src/adwaita_utils.c 2012-06-06 14:13:08 +0000
2960+++ src/adwaita_utils.c 1970-01-01 00:00:00 +0000
2961@@ -1,119 +0,0 @@
2962-/* Adwaita - a GTK+ engine
2963- *
2964- * Copyright (C) 2011 Carlos Garnacho <carlosg@gnome.org>
2965- * Copyright (C) 2011 Red Hat, Inc.
2966- *
2967- * This library is free software; you can redistribute it and/or
2968- * modify it under the terms of the GNU Lesser General Public
2969- * License as published by the Free Software Foundation; either
2970- * version 2.1 of the License, or (at your option) any later version.
2971- *
2972- * This library is distributed in the hope that it will be useful,
2973- * but WITHOUT ANY WARRANTY; without even the implied warranty of
2974- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
2975- * Lesser General Public License for more details.
2976- *
2977- * You should have received a copy of the GNU Lesser General Public
2978- * License along with this library; if not, write to the Free Software
2979- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
2980- *
2981- * Authors: Carlos Garnacho <carlosg@gnome.org>
2982- * Cosimo Cecchi <cosimoc@gnome.org>
2983- *
2984- * Project contact: <gnome-themes-list@gnome.org>
2985- */
2986-
2987-#include "adwaita_utils.h"
2988-
2989-void
2990-_cairo_round_rectangle_sides (cairo_t *cr,
2991- gdouble radius,
2992- gdouble x,
2993- gdouble y,
2994- gdouble width,
2995- gdouble height,
2996- guint sides,
2997- GtkJunctionSides junction)
2998-{
2999- radius = CLAMP (radius, 0, MIN (width / 2, height / 2));
3000-
3001- if (sides & SIDE_RIGHT)
3002- {
3003- if (radius == 0 ||
3004- (junction & GTK_JUNCTION_CORNER_TOPRIGHT))
3005- cairo_move_to (cr, x + width, y);
3006- else
3007- {
3008- cairo_new_sub_path (cr);
3009- cairo_arc (cr, x + width - radius, y + radius, radius, - G_PI / 4, 0);
3010- }
3011-
3012- if (radius == 0 ||
3013- (junction & GTK_JUNCTION_CORNER_BOTTOMRIGHT))
3014- cairo_line_to (cr, x + width, y + height);
3015- else
3016- cairo_arc (cr, x + width - radius, y + height - radius, radius, 0, G_PI / 4);
3017- }
3018-
3019- if (sides & SIDE_BOTTOM)
3020- {
3021- if (radius != 0 &&
3022- ! (junction & GTK_JUNCTION_CORNER_BOTTOMRIGHT))
3023- {
3024- if ((sides & SIDE_RIGHT) == 0)
3025- cairo_new_sub_path (cr);
3026-
3027- cairo_arc (cr, x + width - radius, y + height - radius, radius, G_PI / 4, G_PI / 2);
3028- }
3029- else if ((sides & SIDE_RIGHT) == 0)
3030- cairo_move_to (cr, x + width, y + height);
3031-
3032- if (radius == 0 ||
3033- (junction & GTK_JUNCTION_CORNER_BOTTOMLEFT))
3034- cairo_line_to (cr, x, y + height);
3035- else
3036- cairo_arc (cr, x + radius, y + height - radius, radius, G_PI / 2, 3 * (G_PI / 4));
3037- }
3038- else
3039- cairo_move_to (cr, x, y + height);
3040-
3041- if (sides & SIDE_LEFT)
3042- {
3043- if (radius != 0 &&
3044- ! (junction & GTK_JUNCTION_CORNER_BOTTOMLEFT))
3045- {
3046- if ((sides & SIDE_BOTTOM) == 0)
3047- cairo_new_sub_path (cr);
3048-
3049- cairo_arc (cr, x + radius, y + height - radius, radius, 3 * (G_PI / 4), G_PI);
3050- }
3051- else if ((sides & SIDE_BOTTOM) == 0)
3052- cairo_move_to (cr, x, y + height);
3053-
3054- if (radius == 0 ||
3055- (junction & GTK_JUNCTION_CORNER_TOPLEFT))
3056- cairo_line_to (cr, x, y);
3057- else
3058- cairo_arc (cr, x + radius, y + radius, radius, G_PI, G_PI + G_PI / 4);
3059- }
3060-
3061- if (sides & SIDE_TOP)
3062- {
3063- if (radius != 0 &&
3064- ! (junction & GTK_JUNCTION_CORNER_TOPLEFT))
3065- {
3066- if ((sides & SIDE_LEFT) == 0)
3067- cairo_new_sub_path (cr);
3068-
3069- cairo_arc (cr, x + radius, y + radius, radius, 5 * (G_PI / 4), 3 * (G_PI / 2));
3070- }
3071- else if ((sides & SIDE_LEFT) == 0)
3072- cairo_move_to (cr, x, y);
3073-
3074- if (radius == 0 ||
3075- (junction & GTK_JUNCTION_CORNER_TOPRIGHT))
3076- cairo_line_to (cr, x + width, y);
3077- else
3078- cairo_arc (cr, x + width - radius, y + radius, radius, 3 * (G_PI / 2), - G_PI / 4);
3079- }
3080-}
3081
3082=== removed file 'src/adwaita_utils.h'
3083--- src/adwaita_utils.h 2012-06-06 14:13:08 +0000
3084+++ src/adwaita_utils.h 1970-01-01 00:00:00 +0000
3085@@ -1,49 +0,0 @@
3086-/* Adwaita - a GTK+ engine
3087- *
3088- * Copyright (C) 2011 Carlos Garnacho <carlosg@gnome.org>
3089- * Copyright (C) 2011 Red Hat, Inc.
3090- *
3091- * This library is free software; you can redistribute it and/or
3092- * modify it under the terms of the GNU Lesser General Public
3093- * License as published by the Free Software Foundation; either
3094- * version 2.1 of the License, or (at your option) any later version.
3095- *
3096- * This library is distributed in the hope that it will be useful,
3097- * but WITHOUT ANY WARRANTY; without even the implied warranty of
3098- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
3099- * Lesser General Public License for more details.
3100- *
3101- * You should have received a copy of the GNU Lesser General Public
3102- * License along with this library; if not, write to the Free Software
3103- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
3104- *
3105- * Authors: Carlos Garnacho <carlosg@gnome.org>
3106- * Cosimo Cecchi <cosimoc@gnome.org>
3107- *
3108- * Project contact: <gnome-themes-list@gnome.org>
3109- */
3110-
3111-#include <gtk/gtk.h>
3112-
3113-#ifndef __ADWAITA_UTILS_H__
3114-#define __ADWAITA_UTILS_H__
3115-
3116-enum {
3117- SIDE_LEFT = 1,
3118- SIDE_BOTTOM = 1 << 1,
3119- SIDE_RIGHT = 1 << 2,
3120- SIDE_TOP = 1 << 3,
3121- SIDE_ALL = 0xF
3122-};
3123-
3124-void
3125-_cairo_round_rectangle_sides (cairo_t *cr,
3126- gdouble radius,
3127- gdouble x,
3128- gdouble y,
3129- gdouble width,
3130- gdouble height,
3131- guint sides,
3132- GtkJunctionSides junction);
3133-
3134-#endif /* __ADWAITA_UTILS_H__ */
3135
3136=== removed file 'src/engine.symbols'
3137--- src/engine.symbols 2012-03-22 12:34:07 +0000
3138+++ src/engine.symbols 1970-01-01 00:00:00 +0000
3139@@ -1,3 +0,0 @@
3140-theme_init
3141-theme_exit
3142-create_engine
3143
3144=== modified file 'themes/Adwaita/Makefile.am'
3145--- themes/Adwaita/Makefile.am 2012-06-06 14:13:08 +0000
3146+++ themes/Adwaita/Makefile.am 2012-11-22 00:35:57 +0000
3147@@ -1,9 +1,13 @@
3148-SUBDIRS = backgrounds cursors metacity-1 gtk-2.0
3149+SUBDIRS = backgrounds cursors metacity-1
3150
3151-if GTK3
3152+if GTK3_ENGINE
3153 SUBDIRS += gtk-3.0
3154 endif
3155
3156+if GTK2_ENGINE
3157+SUBDIRS += gtk-2.0
3158+endif
3159+
3160 THEME_NAME=Adwaita
3161 THEME_IN_FILES=index.theme.in
3162
3163
3164=== modified file 'themes/Adwaita/Makefile.in'
3165--- themes/Adwaita/Makefile.in 2012-08-08 11:44:00 +0000
3166+++ themes/Adwaita/Makefile.in 2012-11-22 00:35:57 +0000
3167@@ -50,7 +50,8 @@
3168 POST_UNINSTALL = :
3169 build_triplet = @build@
3170 host_triplet = @host@
3171-@GTK3_TRUE@am__append_1 = gtk-3.0
3172+@GTK3_ENGINE_TRUE@am__append_1 = gtk-3.0
3173+@GTK2_ENGINE_TRUE@am__append_2 = gtk-2.0
3174 subdir = themes/Adwaita
3175 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
3176 $(top_srcdir)/mkinstalldirs
3177@@ -61,6 +62,18 @@
3178 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
3179 CONFIG_CLEAN_FILES =
3180 CONFIG_CLEAN_VPATH_FILES =
3181+AM_V_P = $(am__v_P_@AM_V@)
3182+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
3183+am__v_P_0 = false
3184+am__v_P_1 = :
3185+AM_V_GEN = $(am__v_GEN_@AM_V@)
3186+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
3187+am__v_GEN_0 = @echo " GEN " $@;
3188+am__v_GEN_1 =
3189+AM_V_at = $(am__v_at_@AM_V@)
3190+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
3191+am__v_at_0 = @
3192+am__v_at_1 =
3193 SOURCES =
3194 DIST_SOURCES =
3195 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
3196@@ -111,7 +124,7 @@
3197 distdir
3198 ETAGS = etags
3199 CTAGS = ctags
3200-DIST_SUBDIRS = backgrounds cursors metacity-1 gtk-2.0 gtk-3.0
3201+DIST_SUBDIRS = backgrounds cursors metacity-1 gtk-3.0 gtk-2.0
3202 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
3203 am__relativize = \
3204 dir0=`pwd`; \
3205@@ -160,8 +173,6 @@
3206 DATADIRNAME = @DATADIRNAME@
3207 DEFS = @DEFS@
3208 DEPDIR = @DEPDIR@
3209-DEPENDENCIES_CFLAGS = @DEPENDENCIES_CFLAGS@
3210-DEPENDENCIES_LIBS = @DEPENDENCIES_LIBS@
3211 DLLTOOL = @DLLTOOL@
3212 DSYMUTIL = @DSYMUTIL@
3213 DUMPBIN = @DUMPBIN@
3214@@ -181,8 +192,13 @@
3215 GMSGFMT = @GMSGFMT@
3216 GOBJECT_QUERY = @GOBJECT_QUERY@
3217 GREP = @GREP@
3218+GTK2_ENGINE_CFLAGS = @GTK2_ENGINE_CFLAGS@
3219+GTK2_ENGINE_LIBS = @GTK2_ENGINE_LIBS@
3220+GTK2_VERSION = @GTK2_VERSION@
3221+GTK3_ENGINE_CFLAGS = @GTK3_ENGINE_CFLAGS@
3222+GTK3_ENGINE_LIBS = @GTK3_ENGINE_LIBS@
3223+GTK3_VERSION = @GTK3_VERSION@
3224 GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
3225-GTK_VERSION = @GTK_VERSION@
3226 HIGHCONTRAST_CFLAGS = @HIGHCONTRAST_CFLAGS@
3227 HIGHCONTRAST_LIBS = @HIGHCONTRAST_LIBS@
3228 INSTALL = @INSTALL@
3229@@ -298,7 +314,8 @@
3230 top_build_prefix = @top_build_prefix@
3231 top_builddir = @top_builddir@
3232 top_srcdir = @top_srcdir@
3233-SUBDIRS = backgrounds cursors metacity-1 gtk-2.0 $(am__append_1)
3234+SUBDIRS = backgrounds cursors metacity-1 $(am__append_1) \
3235+ $(am__append_2)
3236 THEME_NAME = Adwaita
3237 THEME_IN_FILES = index.theme.in
3238 themedir = $(datadir)/themes/$(THEME_NAME)
3239
3240=== modified file 'themes/Adwaita/backgrounds/Makefile.in'
3241--- themes/Adwaita/backgrounds/Makefile.in 2012-08-08 11:44:00 +0000
3242+++ themes/Adwaita/backgrounds/Makefile.in 2012-11-22 00:35:57 +0000
3243@@ -60,6 +60,18 @@
3244 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
3245 CONFIG_CLEAN_FILES =
3246 CONFIG_CLEAN_VPATH_FILES =
3247+AM_V_P = $(am__v_P_@AM_V@)
3248+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
3249+am__v_P_0 = false
3250+am__v_P_1 = :
3251+AM_V_GEN = $(am__v_GEN_@AM_V@)
3252+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
3253+am__v_GEN_0 = @echo " GEN " $@;
3254+am__v_GEN_1 =
3255+AM_V_at = $(am__v_at_@AM_V@)
3256+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
3257+am__v_at_0 = @
3258+am__v_at_1 =
3259 SOURCES =
3260 DIST_SOURCES =
3261 am__can_run_installinfo = \
3262@@ -120,8 +132,6 @@
3263 DATADIRNAME = @DATADIRNAME@
3264 DEFS = @DEFS@
3265 DEPDIR = @DEPDIR@
3266-DEPENDENCIES_CFLAGS = @DEPENDENCIES_CFLAGS@
3267-DEPENDENCIES_LIBS = @DEPENDENCIES_LIBS@
3268 DLLTOOL = @DLLTOOL@
3269 DSYMUTIL = @DSYMUTIL@
3270 DUMPBIN = @DUMPBIN@
3271@@ -141,8 +151,13 @@
3272 GMSGFMT = @GMSGFMT@
3273 GOBJECT_QUERY = @GOBJECT_QUERY@
3274 GREP = @GREP@
3275+GTK2_ENGINE_CFLAGS = @GTK2_ENGINE_CFLAGS@
3276+GTK2_ENGINE_LIBS = @GTK2_ENGINE_LIBS@
3277+GTK2_VERSION = @GTK2_VERSION@
3278+GTK3_ENGINE_CFLAGS = @GTK3_ENGINE_CFLAGS@
3279+GTK3_ENGINE_LIBS = @GTK3_ENGINE_LIBS@
3280+GTK3_VERSION = @GTK3_VERSION@
3281 GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
3282-GTK_VERSION = @GTK_VERSION@
3283 HIGHCONTRAST_CFLAGS = @HIGHCONTRAST_CFLAGS@
3284 HIGHCONTRAST_LIBS = @HIGHCONTRAST_LIBS@
3285 INSTALL = @INSTALL@
3286
3287=== modified file 'themes/Adwaita/cursors/Makefile.in'
3288--- themes/Adwaita/cursors/Makefile.in 2012-08-08 11:44:00 +0000
3289+++ themes/Adwaita/cursors/Makefile.in 2012-11-22 00:35:57 +0000
3290@@ -60,6 +60,18 @@
3291 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
3292 CONFIG_CLEAN_FILES =
3293 CONFIG_CLEAN_VPATH_FILES =
3294+AM_V_P = $(am__v_P_@AM_V@)
3295+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
3296+am__v_P_0 = false
3297+am__v_P_1 = :
3298+AM_V_GEN = $(am__v_GEN_@AM_V@)
3299+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
3300+am__v_GEN_0 = @echo " GEN " $@;
3301+am__v_GEN_1 =
3302+AM_V_at = $(am__v_at_@AM_V@)
3303+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
3304+am__v_at_0 = @
3305+am__v_at_1 =
3306 SOURCES =
3307 DIST_SOURCES =
3308 am__can_run_installinfo = \
3309@@ -119,8 +131,6 @@
3310 DATADIRNAME = @DATADIRNAME@
3311 DEFS = @DEFS@
3312 DEPDIR = @DEPDIR@
3313-DEPENDENCIES_CFLAGS = @DEPENDENCIES_CFLAGS@
3314-DEPENDENCIES_LIBS = @DEPENDENCIES_LIBS@
3315 DLLTOOL = @DLLTOOL@
3316 DSYMUTIL = @DSYMUTIL@
3317 DUMPBIN = @DUMPBIN@
3318@@ -140,8 +150,13 @@
3319 GMSGFMT = @GMSGFMT@
3320 GOBJECT_QUERY = @GOBJECT_QUERY@
3321 GREP = @GREP@
3322+GTK2_ENGINE_CFLAGS = @GTK2_ENGINE_CFLAGS@
3323+GTK2_ENGINE_LIBS = @GTK2_ENGINE_LIBS@
3324+GTK2_VERSION = @GTK2_VERSION@
3325+GTK3_ENGINE_CFLAGS = @GTK3_ENGINE_CFLAGS@
3326+GTK3_ENGINE_LIBS = @GTK3_ENGINE_LIBS@
3327+GTK3_VERSION = @GTK3_VERSION@
3328 GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
3329-GTK_VERSION = @GTK_VERSION@
3330 HIGHCONTRAST_CFLAGS = @HIGHCONTRAST_CFLAGS@
3331 HIGHCONTRAST_LIBS = @HIGHCONTRAST_LIBS@
3332 INSTALL = @INSTALL@
3333
3334=== removed file 'themes/Adwaita/gtk-2.0/Check-Radio/check1.png'
3335Binary files themes/Adwaita/gtk-2.0/Check-Radio/check1.png 2012-10-02 00:58:28 +0000 and themes/Adwaita/gtk-2.0/Check-Radio/check1.png 1970-01-01 00:00:00 +0000 differ
3336=== removed file 'themes/Adwaita/gtk-2.0/Check-Radio/check2.png'
3337Binary files themes/Adwaita/gtk-2.0/Check-Radio/check2.png 2012-10-02 00:58:28 +0000 and themes/Adwaita/gtk-2.0/Check-Radio/check2.png 1970-01-01 00:00:00 +0000 differ
3338=== added file 'themes/Adwaita/gtk-2.0/Check-Radio/checkbox-checked-insensitive.png'
3339Binary files themes/Adwaita/gtk-2.0/Check-Radio/checkbox-checked-insensitive.png 1970-01-01 00:00:00 +0000 and themes/Adwaita/gtk-2.0/Check-Radio/checkbox-checked-insensitive.png 2012-11-22 00:35:57 +0000 differ
3340=== added file 'themes/Adwaita/gtk-2.0/Check-Radio/checkbox-checked.png'
3341Binary files themes/Adwaita/gtk-2.0/Check-Radio/checkbox-checked.png 1970-01-01 00:00:00 +0000 and themes/Adwaita/gtk-2.0/Check-Radio/checkbox-checked.png 2012-11-22 00:35:57 +0000 differ
3342=== added file 'themes/Adwaita/gtk-2.0/Check-Radio/checkbox-unchecked-insensitive.png'
3343Binary files themes/Adwaita/gtk-2.0/Check-Radio/checkbox-unchecked-insensitive.png 1970-01-01 00:00:00 +0000 and themes/Adwaita/gtk-2.0/Check-Radio/checkbox-unchecked-insensitive.png 2012-11-22 00:35:57 +0000 differ
3344=== added file 'themes/Adwaita/gtk-2.0/Check-Radio/checkbox-unchecked.png'
3345Binary files themes/Adwaita/gtk-2.0/Check-Radio/checkbox-unchecked.png 1970-01-01 00:00:00 +0000 and themes/Adwaita/gtk-2.0/Check-Radio/checkbox-unchecked.png 2012-11-22 00:35:57 +0000 differ
3346=== modified file 'themes/Adwaita/gtk-2.0/Check-Radio/menucheck.png' (properties changed: +x to -x)
3347=== modified file 'themes/Adwaita/gtk-2.0/Check-Radio/menucheck_prelight.png' (properties changed: +x to -x)
3348=== modified file 'themes/Adwaita/gtk-2.0/Check-Radio/menuoption.png' (properties changed: +x to -x)
3349=== modified file 'themes/Adwaita/gtk-2.0/Check-Radio/menuoption_prelight.png' (properties changed: +x to -x)
3350=== added file 'themes/Adwaita/gtk-2.0/Check-Radio/option-checked-insensitive.png'
3351Binary files themes/Adwaita/gtk-2.0/Check-Radio/option-checked-insensitive.png 1970-01-01 00:00:00 +0000 and themes/Adwaita/gtk-2.0/Check-Radio/option-checked-insensitive.png 2012-11-22 00:35:57 +0000 differ
3352=== added file 'themes/Adwaita/gtk-2.0/Check-Radio/option-checked.png'
3353Binary files themes/Adwaita/gtk-2.0/Check-Radio/option-checked.png 1970-01-01 00:00:00 +0000 and themes/Adwaita/gtk-2.0/Check-Radio/option-checked.png 2012-11-22 00:35:57 +0000 differ
3354=== added file 'themes/Adwaita/gtk-2.0/Check-Radio/option-unchecked-insensitive.png'
3355Binary files themes/Adwaita/gtk-2.0/Check-Radio/option-unchecked-insensitive.png 1970-01-01 00:00:00 +0000 and themes/Adwaita/gtk-2.0/Check-Radio/option-unchecked-insensitive.png 2012-11-22 00:35:57 +0000 differ
3356=== added file 'themes/Adwaita/gtk-2.0/Check-Radio/option-unchecked.png'
3357Binary files themes/Adwaita/gtk-2.0/Check-Radio/option-unchecked.png 1970-01-01 00:00:00 +0000 and themes/Adwaita/gtk-2.0/Check-Radio/option-unchecked.png 2012-11-22 00:35:57 +0000 differ
3358=== removed file 'themes/Adwaita/gtk-2.0/Check-Radio/option1.png'
3359Binary files themes/Adwaita/gtk-2.0/Check-Radio/option1.png 2012-10-02 00:58:28 +0000 and themes/Adwaita/gtk-2.0/Check-Radio/option1.png 1970-01-01 00:00:00 +0000 differ
3360=== removed file 'themes/Adwaita/gtk-2.0/Check-Radio/option2.png'
3361Binary files themes/Adwaita/gtk-2.0/Check-Radio/option2.png 2012-10-02 00:58:28 +0000 and themes/Adwaita/gtk-2.0/Check-Radio/option2.png 1970-01-01 00:00:00 +0000 differ
3362=== modified file 'themes/Adwaita/gtk-2.0/Expanders/minus.png' (properties changed: +x to -x)
3363=== modified file 'themes/Adwaita/gtk-2.0/Expanders/plus.png' (properties changed: +x to -x)
3364=== modified file 'themes/Adwaita/gtk-2.0/Handles/handle-h.png' (properties changed: +x to -x)
3365=== modified file 'themes/Adwaita/gtk-2.0/Handles/handle-v.png' (properties changed: +x to -x)
3366=== modified file 'themes/Adwaita/gtk-2.0/Lines/line-v.png' (properties changed: +x to -x)
3367=== modified file 'themes/Adwaita/gtk-2.0/Lines/menu_line_h.png' (properties changed: +x to -x)
3368=== modified file 'themes/Adwaita/gtk-2.0/Makefile.am'
3369--- themes/Adwaita/gtk-2.0/Makefile.am 2012-10-02 00:58:28 +0000
3370+++ themes/Adwaita/gtk-2.0/Makefile.am 2012-11-22 00:35:57 +0000
3371@@ -1,4 +1,10 @@
3372+enginedir = $(libdir)/gtk-2.0/$(GTK2_VERSION)/engines
3373+engine_LTLIBRARIES = libadwaita.la
3374
3375+libadwaita_la_CFLAGS = $(GTK2_ENGINE_CFLAGS)
3376+libadwaita_la_SOURCES = adwaita_engine.c
3377+libadwaita_la_LDFLAGS = -module -avoid-version -no-undefined
3378+libadwaita_la_LIBADD = $(GTK2_ENGINE_LIBS)
3379
3380 themedir = $(datadir)/themes/Adwaita/gtk-2.0
3381 theme_DATA = gtkrc
3382@@ -31,14 +37,18 @@
3383 Buttons/button-insensitive-nohilight.png \
3384 Buttons/button-prelight-nohilight.png \
3385 Buttons/button-pressed-nohilight.png \
3386- Check-Radio/check1.png \
3387- Check-Radio/check2.png \
3388+ Check-Radio/checkbox-checked.png \
3389+ Check-Radio/checkbox-unchecked.png \
3390+ Check-Radio/checkbox-checked-insensitive.png \
3391+ Check-Radio/checkbox-unchecked-insensitive.png \
3392 Check-Radio/menucheck.png \
3393 Check-Radio/menucheck_prelight.png \
3394 Check-Radio/menuoption.png \
3395 Check-Radio/menuoption_prelight.png \
3396- Check-Radio/option1.png \
3397- Check-Radio/option2.png \
3398+ Check-Radio/option-checked.png \
3399+ Check-Radio/option-unchecked.png \
3400+ Check-Radio/option-checked-insensitive.png \
3401+ Check-Radio/option-unchecked-insensitive.png \
3402 Entry/combo-entry-border.png \
3403 Entry/combo-entry-border-rtl.png \
3404 Entry/combo-entry-border-active.png \
3405
3406=== modified file 'themes/Adwaita/gtk-2.0/Makefile.in'
3407--- themes/Adwaita/gtk-2.0/Makefile.in 2012-10-02 00:58:28 +0000
3408+++ themes/Adwaita/gtk-2.0/Makefile.in 2012-11-22 00:35:57 +0000
3409@@ -14,6 +14,7 @@
3410
3411 @SET_MAKE@
3412
3413+
3414 VPATH = @srcdir@
3415 am__make_dryrun = \
3416 { \
3417@@ -52,7 +53,7 @@
3418 host_triplet = @host@
3419 subdir = themes/Adwaita/gtk-2.0
3420 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
3421- $(top_srcdir)/mkinstalldirs
3422+ $(top_srcdir)/depcomp $(top_srcdir)/mkinstalldirs
3423 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
3424 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
3425 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
3426@@ -60,13 +61,6 @@
3427 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
3428 CONFIG_CLEAN_FILES =
3429 CONFIG_CLEAN_VPATH_FILES =
3430-SOURCES =
3431-DIST_SOURCES =
3432-am__can_run_installinfo = \
3433- case $$AM_UPDATE_INFO_DIR in \
3434- n|no|NO) false;; \
3435- *) (install-info --version) >/dev/null 2>&1;; \
3436- esac
3437 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
3438 am__vpath_adj = case $$p in \
3439 $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
3440@@ -94,8 +88,63 @@
3441 || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
3442 $(am__cd) "$$dir" && rm -f $$files; }; \
3443 }
3444-am__installdirs = "$(DESTDIR)$(themedir)"
3445+am__installdirs = "$(DESTDIR)$(enginedir)" "$(DESTDIR)$(themedir)"
3446+LTLIBRARIES = $(engine_LTLIBRARIES)
3447+am__DEPENDENCIES_1 =
3448+libadwaita_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
3449+am_libadwaita_la_OBJECTS = libadwaita_la-adwaita_engine.lo
3450+libadwaita_la_OBJECTS = $(am_libadwaita_la_OBJECTS)
3451+AM_V_lt = $(am__v_lt_@AM_V@)
3452+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
3453+am__v_lt_0 = --silent
3454+am__v_lt_1 =
3455+libadwaita_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
3456+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libadwaita_la_CFLAGS) \
3457+ $(CFLAGS) $(libadwaita_la_LDFLAGS) $(LDFLAGS) -o $@
3458+AM_V_P = $(am__v_P_@AM_V@)
3459+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
3460+am__v_P_0 = false
3461+am__v_P_1 = :
3462+AM_V_GEN = $(am__v_GEN_@AM_V@)
3463+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
3464+am__v_GEN_0 = @echo " GEN " $@;
3465+am__v_GEN_1 =
3466+AM_V_at = $(am__v_at_@AM_V@)
3467+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
3468+am__v_at_0 = @
3469+am__v_at_1 =
3470+DEFAULT_INCLUDES = -I.@am__isrc@
3471+depcomp = $(SHELL) $(top_srcdir)/depcomp
3472+am__depfiles_maybe = depfiles
3473+am__mv = mv -f
3474+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
3475+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
3476+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
3477+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
3478+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
3479+ $(AM_CFLAGS) $(CFLAGS)
3480+AM_V_CC = $(am__v_CC_@AM_V@)
3481+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
3482+am__v_CC_0 = @echo " CC " $@;
3483+am__v_CC_1 =
3484+CCLD = $(CC)
3485+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
3486+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
3487+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
3488+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
3489+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
3490+am__v_CCLD_0 = @echo " CCLD " $@;
3491+am__v_CCLD_1 =
3492+SOURCES = $(libadwaita_la_SOURCES)
3493+DIST_SOURCES = $(libadwaita_la_SOURCES)
3494+am__can_run_installinfo = \
3495+ case $$AM_UPDATE_INFO_DIR in \
3496+ n|no|NO) false;; \
3497+ *) (install-info --version) >/dev/null 2>&1;; \
3498+ esac
3499 DATA = $(theme_DATA)
3500+ETAGS = etags
3501+CTAGS = ctags
3502 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
3503 ACLOCAL = @ACLOCAL@
3504 ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
3505@@ -119,8 +168,6 @@
3506 DATADIRNAME = @DATADIRNAME@
3507 DEFS = @DEFS@
3508 DEPDIR = @DEPDIR@
3509-DEPENDENCIES_CFLAGS = @DEPENDENCIES_CFLAGS@
3510-DEPENDENCIES_LIBS = @DEPENDENCIES_LIBS@
3511 DLLTOOL = @DLLTOOL@
3512 DSYMUTIL = @DSYMUTIL@
3513 DUMPBIN = @DUMPBIN@
3514@@ -140,8 +187,13 @@
3515 GMSGFMT = @GMSGFMT@
3516 GOBJECT_QUERY = @GOBJECT_QUERY@
3517 GREP = @GREP@
3518+GTK2_ENGINE_CFLAGS = @GTK2_ENGINE_CFLAGS@
3519+GTK2_ENGINE_LIBS = @GTK2_ENGINE_LIBS@
3520+GTK2_VERSION = @GTK2_VERSION@
3521+GTK3_ENGINE_CFLAGS = @GTK3_ENGINE_CFLAGS@
3522+GTK3_ENGINE_LIBS = @GTK3_ENGINE_LIBS@
3523+GTK3_VERSION = @GTK3_VERSION@
3524 GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
3525-GTK_VERSION = @GTK_VERSION@
3526 HIGHCONTRAST_CFLAGS = @HIGHCONTRAST_CFLAGS@
3527 HIGHCONTRAST_LIBS = @HIGHCONTRAST_LIBS@
3528 INSTALL = @INSTALL@
3529@@ -257,6 +309,12 @@
3530 top_build_prefix = @top_build_prefix@
3531 top_builddir = @top_builddir@
3532 top_srcdir = @top_srcdir@
3533+enginedir = $(libdir)/gtk-2.0/$(GTK2_VERSION)/engines
3534+engine_LTLIBRARIES = libadwaita.la
3535+libadwaita_la_CFLAGS = $(GTK2_ENGINE_CFLAGS)
3536+libadwaita_la_SOURCES = adwaita_engine.c
3537+libadwaita_la_LDFLAGS = -module -avoid-version -no-undefined
3538+libadwaita_la_LIBADD = $(GTK2_ENGINE_LIBS)
3539 themedir = $(datadir)/themes/Adwaita/gtk-2.0
3540 theme_DATA = gtkrc
3541 asset_dirs = "Arrows" "Buttons" "Check-Radio" "Entry" "Expanders" \
3542@@ -288,14 +346,18 @@
3543 Buttons/button-insensitive-nohilight.png \
3544 Buttons/button-prelight-nohilight.png \
3545 Buttons/button-pressed-nohilight.png \
3546- Check-Radio/check1.png \
3547- Check-Radio/check2.png \
3548+ Check-Radio/checkbox-checked.png \
3549+ Check-Radio/checkbox-unchecked.png \
3550+ Check-Radio/checkbox-checked-insensitive.png \
3551+ Check-Radio/checkbox-unchecked-insensitive.png \
3552 Check-Radio/menucheck.png \
3553 Check-Radio/menucheck_prelight.png \
3554 Check-Radio/menuoption.png \
3555 Check-Radio/menuoption_prelight.png \
3556- Check-Radio/option1.png \
3557- Check-Radio/option2.png \
3558+ Check-Radio/option-checked.png \
3559+ Check-Radio/option-unchecked.png \
3560+ Check-Radio/option-checked-insensitive.png \
3561+ Check-Radio/option-unchecked-insensitive.png \
3562 Entry/combo-entry-border.png \
3563 Entry/combo-entry-border-rtl.png \
3564 Entry/combo-entry-border-active.png \
3565@@ -373,6 +435,7 @@
3566 all: all-am
3567
3568 .SUFFIXES:
3569+.SUFFIXES: .c .lo .o .obj
3570 $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
3571 @for dep in $?; do \
3572 case '$(am__configure_deps)' in \
3573@@ -403,6 +466,78 @@
3574 $(ACLOCAL_M4): $(am__aclocal_m4_deps)
3575 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
3576 $(am__aclocal_m4_deps):
3577+install-engineLTLIBRARIES: $(engine_LTLIBRARIES)
3578+ @$(NORMAL_INSTALL)
3579+ @list='$(engine_LTLIBRARIES)'; test -n "$(enginedir)" || list=; \
3580+ list2=; for p in $$list; do \
3581+ if test -f $$p; then \
3582+ list2="$$list2 $$p"; \
3583+ else :; fi; \
3584+ done; \
3585+ test -z "$$list2" || { \
3586+ echo " $(MKDIR_P) '$(DESTDIR)$(enginedir)'"; \
3587+ $(MKDIR_P) "$(DESTDIR)$(enginedir)" || exit 1; \
3588+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(enginedir)'"; \
3589+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(enginedir)"; \
3590+ }
3591+
3592+uninstall-engineLTLIBRARIES:
3593+ @$(NORMAL_UNINSTALL)
3594+ @list='$(engine_LTLIBRARIES)'; test -n "$(enginedir)" || list=; \
3595+ for p in $$list; do \
3596+ $(am__strip_dir) \
3597+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(enginedir)/$$f'"; \
3598+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(enginedir)/$$f"; \
3599+ done
3600+
3601+clean-engineLTLIBRARIES:
3602+ -test -z "$(engine_LTLIBRARIES)" || rm -f $(engine_LTLIBRARIES)
3603+ @list='$(engine_LTLIBRARIES)'; \
3604+ locs=`for p in $$list; do echo $$p; done | \
3605+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
3606+ sort -u`; \
3607+ test -z "$$locs" || { \
3608+ echo rm -f $${locs}; \
3609+ rm -f $${locs}; \
3610+ }
3611+libadwaita.la: $(libadwaita_la_OBJECTS) $(libadwaita_la_DEPENDENCIES) $(EXTRA_libadwaita_la_DEPENDENCIES)
3612+ $(AM_V_CCLD)$(libadwaita_la_LINK) -rpath $(enginedir) $(libadwaita_la_OBJECTS) $(libadwaita_la_LIBADD) $(LIBS)
3613+
3614+mostlyclean-compile:
3615+ -rm -f *.$(OBJEXT)
3616+
3617+distclean-compile:
3618+ -rm -f *.tab.c
3619+
3620+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libadwaita_la-adwaita_engine.Plo@am__quote@
3621+
3622+.c.o:
3623+@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
3624+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
3625+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
3626+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
3627+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $<
3628+
3629+.c.obj:
3630+@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
3631+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
3632+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
3633+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
3634+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
3635+
3636+.c.lo:
3637+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
3638+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
3639+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
3640+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
3641+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
3642+
3643+libadwaita_la-adwaita_engine.lo: adwaita_engine.c
3644+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libadwaita_la_CFLAGS) $(CFLAGS) -MT libadwaita_la-adwaita_engine.lo -MD -MP -MF $(DEPDIR)/libadwaita_la-adwaita_engine.Tpo -c -o libadwaita_la-adwaita_engine.lo `test -f 'adwaita_engine.c' || echo '$(srcdir)/'`adwaita_engine.c
3645+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libadwaita_la-adwaita_engine.Tpo $(DEPDIR)/libadwaita_la-adwaita_engine.Plo
3646+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='adwaita_engine.c' object='libadwaita_la-adwaita_engine.lo' libtool=yes @AMDEPBACKSLASH@
3647+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
3648+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libadwaita_la_CFLAGS) $(CFLAGS) -c -o libadwaita_la-adwaita_engine.lo `test -f 'adwaita_engine.c' || echo '$(srcdir)/'`adwaita_engine.c
3649
3650 mostlyclean-libtool:
3651 -rm -f *.lo
3652@@ -430,14 +565,72 @@
3653 @list='$(theme_DATA)'; test -n "$(themedir)" || list=; \
3654 files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
3655 dir='$(DESTDIR)$(themedir)'; $(am__uninstall_files_from_dir)
3656+
3657+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
3658+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
3659+ unique=`for i in $$list; do \
3660+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
3661+ done | \
3662+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
3663+ END { if (nonempty) { for (i in files) print i; }; }'`; \
3664+ mkid -fID $$unique
3665 tags: TAGS
3666-TAGS:
3667
3668+TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
3669+ $(TAGS_FILES) $(LISP)
3670+ set x; \
3671+ here=`pwd`; \
3672+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
3673+ unique=`for i in $$list; do \
3674+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
3675+ done | \
3676+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
3677+ END { if (nonempty) { for (i in files) print i; }; }'`; \
3678+ shift; \
3679+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
3680+ test -n "$$unique" || unique=$$empty_fix; \
3681+ if test $$# -gt 0; then \
3682+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
3683+ "$$@" $$unique; \
3684+ else \
3685+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
3686+ $$unique; \
3687+ fi; \
3688+ fi
3689 ctags: CTAGS
3690-CTAGS:
3691-
3692-cscope cscopelist:
3693-
3694+CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
3695+ $(TAGS_FILES) $(LISP)
3696+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
3697+ unique=`for i in $$list; do \
3698+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
3699+ done | \
3700+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
3701+ END { if (nonempty) { for (i in files) print i; }; }'`; \
3702+ test -z "$(CTAGS_ARGS)$$unique" \
3703+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
3704+ $$unique
3705+
3706+GTAGS:
3707+ here=`$(am__cd) $(top_builddir) && pwd` \
3708+ && $(am__cd) $(top_srcdir) \
3709+ && gtags -i $(GTAGS_ARGS) "$$here"
3710+
3711+cscopelist: $(HEADERS) $(SOURCES) $(LISP)
3712+ list='$(SOURCES) $(HEADERS) $(LISP)'; \
3713+ case "$(srcdir)" in \
3714+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
3715+ *) sdir=$(subdir)/$(srcdir) ;; \
3716+ esac; \
3717+ for i in $$list; do \
3718+ if test -f "$$i"; then \
3719+ echo "$(subdir)/$$i"; \
3720+ else \
3721+ echo "$$sdir/$$i"; \
3722+ fi; \
3723+ done >> $(top_builddir)/cscope.files
3724+
3725+distclean-tags:
3726+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
3727
3728 distdir: $(DISTFILES)
3729 @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
3730@@ -471,9 +664,9 @@
3731 done
3732 check-am: all-am
3733 check: check-am
3734-all-am: Makefile $(DATA)
3735+all-am: Makefile $(LTLIBRARIES) $(DATA)
3736 installdirs:
3737- for dir in "$(DESTDIR)$(themedir)"; do \
3738+ for dir in "$(DESTDIR)$(enginedir)" "$(DESTDIR)$(themedir)"; do \
3739 test -z "$$dir" || $(MKDIR_P) "$$dir"; \
3740 done
3741 install: install-am
3742@@ -508,11 +701,14 @@
3743 @echo "it deletes files that may require special tools to rebuild."
3744 clean: clean-am
3745
3746-clean-am: clean-generic clean-libtool mostlyclean-am
3747+clean-am: clean-engineLTLIBRARIES clean-generic clean-libtool \
3748+ mostlyclean-am
3749
3750 distclean: distclean-am
3751+ -rm -rf ./$(DEPDIR)
3752 -rm -f Makefile
3753-distclean-am: clean-am distclean-generic
3754+distclean-am: clean-am distclean-compile distclean-generic \
3755+ distclean-tags
3756
3757 dvi: dvi-am
3758
3759@@ -526,7 +722,8 @@
3760
3761 info-am:
3762
3763-install-data-am: install-data-local install-themeDATA
3764+install-data-am: install-data-local install-engineLTLIBRARIES \
3765+ install-themeDATA
3766
3767 install-dvi: install-dvi-am
3768
3769@@ -555,12 +752,14 @@
3770 installcheck-am:
3771
3772 maintainer-clean: maintainer-clean-am
3773+ -rm -rf ./$(DEPDIR)
3774 -rm -f Makefile
3775 maintainer-clean-am: distclean-am maintainer-clean-generic
3776
3777 mostlyclean: mostlyclean-am
3778
3779-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
3780+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
3781+ mostlyclean-libtool
3782
3783 pdf: pdf-am
3784
3785@@ -570,22 +769,26 @@
3786
3787 ps-am:
3788
3789-uninstall-am: uninstall-local uninstall-themeDATA
3790+uninstall-am: uninstall-engineLTLIBRARIES uninstall-local \
3791+ uninstall-themeDATA
3792
3793 .MAKE: install-am install-strip
3794
3795-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
3796- distclean distclean-generic distclean-libtool distdir dvi \
3797- dvi-am html html-am info info-am install install-am \
3798- install-data install-data-am install-data-local install-dvi \
3799- install-dvi-am install-exec install-exec-am install-html \
3800- install-html-am install-info install-info-am install-man \
3801- install-pdf install-pdf-am install-ps install-ps-am \
3802- install-strip install-themeDATA installcheck installcheck-am \
3803- installdirs maintainer-clean maintainer-clean-generic \
3804- mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
3805- ps ps-am uninstall uninstall-am uninstall-local \
3806- uninstall-themeDATA
3807+.PHONY: CTAGS GTAGS all all-am check check-am clean \
3808+ clean-engineLTLIBRARIES clean-generic clean-libtool cscopelist \
3809+ ctags distclean distclean-compile distclean-generic \
3810+ distclean-libtool distclean-tags distdir dvi dvi-am html \
3811+ html-am info info-am install install-am install-data \
3812+ install-data-am install-data-local install-dvi install-dvi-am \
3813+ install-engineLTLIBRARIES install-exec install-exec-am \
3814+ install-html install-html-am install-info install-info-am \
3815+ install-man install-pdf install-pdf-am install-ps \
3816+ install-ps-am install-strip install-themeDATA installcheck \
3817+ installcheck-am installdirs maintainer-clean \
3818+ maintainer-clean-generic mostlyclean mostlyclean-compile \
3819+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
3820+ tags uninstall uninstall-am uninstall-engineLTLIBRARIES \
3821+ uninstall-local uninstall-themeDATA
3822
3823
3824 install-data-local:
3825
3826=== modified file 'themes/Adwaita/gtk-2.0/Menu-Menubar/menubar.png' (properties changed: +x to -x)
3827=== modified file 'themes/Adwaita/gtk-2.0/Menu-Menubar/menubar_button.png' (properties changed: +x to -x)
3828=== modified file 'themes/Adwaita/gtk-2.0/Others/bg.png' (properties changed: +x to -x)
3829=== modified file 'themes/Adwaita/gtk-2.0/Others/ruler.png' (properties changed: +x to -x)
3830=== modified file 'themes/Adwaita/gtk-2.0/Range/slider-horiz-prelight.png' (properties changed: +x to -x)
3831=== modified file 'themes/Adwaita/gtk-2.0/Range/slider-horiz.png' (properties changed: +x to -x)
3832=== modified file 'themes/Adwaita/gtk-2.0/Range/slider-vert-prelight.png' (properties changed: +x to -x)
3833=== modified file 'themes/Adwaita/gtk-2.0/Range/slider-vert.png' (properties changed: +x to -x)
3834=== modified file 'themes/Adwaita/gtk-2.0/Range/trough-horizontal.png' (properties changed: +x to -x)
3835=== modified file 'themes/Adwaita/gtk-2.0/Range/trough-vertical.png' (properties changed: +x to -x)
3836=== modified file 'themes/Adwaita/gtk-2.0/Scrollbars/slider-horiz-active.png' (properties changed: +x to -x)
3837=== modified file 'themes/Adwaita/gtk-2.0/Scrollbars/slider-horiz-insens.png' (properties changed: +x to -x)
3838=== modified file 'themes/Adwaita/gtk-2.0/Scrollbars/slider-horiz-prelight.png' (properties changed: +x to -x)
3839=== modified file 'themes/Adwaita/gtk-2.0/Scrollbars/slider-horiz.png' (properties changed: +x to -x)
3840=== modified file 'themes/Adwaita/gtk-2.0/Scrollbars/slider-vert-active.png' (properties changed: +x to -x)
3841=== modified file 'themes/Adwaita/gtk-2.0/Scrollbars/slider-vert-insens.png' (properties changed: +x to -x)
3842=== modified file 'themes/Adwaita/gtk-2.0/Scrollbars/slider-vert-prelight.png' (properties changed: +x to -x)
3843=== modified file 'themes/Adwaita/gtk-2.0/Scrollbars/slider-vert.png' (properties changed: +x to -x)
3844=== modified file 'themes/Adwaita/gtk-2.0/Scrollbars/trough-scrollbar-horiz.png' (properties changed: +x to -x)
3845=== modified file 'themes/Adwaita/gtk-2.0/Scrollbars/trough-scrollbar-vert.png' (properties changed: +x to -x)
3846=== modified file 'themes/Adwaita/gtk-2.0/Shadows/frame.png' (properties changed: +x to -x)
3847=== modified file 'themes/Adwaita/gtk-2.0/Tabs/notebook-gap-horiz.png' (properties changed: +x to -x)
3848=== modified file 'themes/Adwaita/gtk-2.0/Tabs/notebook-gap-vert.png' (properties changed: +x to -x)
3849=== modified file 'themes/Adwaita/gtk-2.0/Tabs/notebook.png' (properties changed: +x to -x)
3850=== modified file 'themes/Adwaita/gtk-2.0/Tabs/tab-bottom-active.png' (properties changed: +x to -x)
3851=== modified file 'themes/Adwaita/gtk-2.0/Tabs/tab-bottom.png' (properties changed: +x to -x)
3852=== modified file 'themes/Adwaita/gtk-2.0/Tabs/tab-left-active.png' (properties changed: +x to -x)
3853=== modified file 'themes/Adwaita/gtk-2.0/Tabs/tab-left.png' (properties changed: +x to -x)
3854=== modified file 'themes/Adwaita/gtk-2.0/Tabs/tab-right-active.png' (properties changed: +x to -x)
3855=== modified file 'themes/Adwaita/gtk-2.0/Tabs/tab-right.png' (properties changed: +x to -x)
3856=== modified file 'themes/Adwaita/gtk-2.0/Tabs/tab-top-active.png' (properties changed: +x to -x)
3857=== modified file 'themes/Adwaita/gtk-2.0/Tabs/tab-top.png' (properties changed: +x to -x)
3858=== modified file 'themes/Adwaita/gtk-2.0/Toolbar/inline-toolbar.png' (properties changed: +x to -x)
3859=== added file 'themes/Adwaita/gtk-2.0/adwaita_engine.c'
3860--- themes/Adwaita/gtk-2.0/adwaita_engine.c 1970-01-01 00:00:00 +0000
3861+++ themes/Adwaita/gtk-2.0/adwaita_engine.c 2012-11-22 00:35:57 +0000
3862@@ -0,0 +1,211 @@
3863+/* Adwaita - a GTK+ engine
3864+ *
3865+ * Copyright (C) 2012 Red Hat, Inc.
3866+ *
3867+ * This library is free software; you can redistribute it and/or
3868+ * modify it under the terms of the GNU Lesser General Public
3869+ * License as published by the Free Software Foundation; either
3870+ * version 2.1 of the License, or (at your option) any later version.
3871+ *
3872+ * This library is distributed in the hope that it will be useful,
3873+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
3874+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
3875+ * Lesser General Public License for more details.
3876+ *
3877+ * You should have received a copy of the GNU Lesser General Public
3878+ * License along with this library; if not, write to the Free Software
3879+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
3880+ *
3881+ * Authors: Cosimo Cecchi <cosimoc@gnome.org>
3882+ */
3883+
3884+#include <gmodule.h>
3885+#include <glib.h>
3886+#include <gtk/gtk.h>
3887+
3888+#ifdef GDK_WINDOWING_X11
3889+#include <gdk/gdkx.h>
3890+#endif
3891+
3892+/***************************************/
3893+/* Register & Initialize Drawing Style */
3894+/***************************************/
3895+#define ADWAITA_TYPE_STYLE (adwaita_style_get_type ())
3896+#define ADWAITA_STYLE(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), ADWAITA_TYPE_STYLE, AdwaitaStyle))
3897+#define ADWAITA_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ADWAITA_TYPE_STYLE, AdwaitaStyleClass))
3898+#define ADWAITA_IS_STYLE(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), ADWAITA_TYPE_STYLE))
3899+#define ADWAITA_IS_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ADWAITA_TYPE_STYLE))
3900+#define ADWAITA_STYLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ADWAITA_TYPE_STYLE, AdwaitaStyleClass))
3901+
3902+typedef struct
3903+{
3904+ GtkStyle parent_instance;
3905+} AdwaitaStyle;
3906+
3907+typedef struct
3908+{
3909+ GtkStyleClass parent_class;
3910+} AdwaitaStyleClass;
3911+
3912+G_DEFINE_DYNAMIC_TYPE (AdwaitaStyle, adwaita_style, GTK_TYPE_STYLE)
3913+
3914+static gboolean
3915+wm_is_fallback (void)
3916+{
3917+#ifdef GDK_WINDOWING_X11
3918+ const gchar *name;
3919+ name = gdk_x11_screen_get_window_manager_name (gdk_screen_get_default ());
3920+ return g_strcmp0 (name, "GNOME Shell") != 0;
3921+#else
3922+ return TRUE;
3923+#endif
3924+}
3925+
3926+static cairo_t *
3927+drawable_to_cairo (GdkDrawable *window,
3928+ GdkRectangle *area)
3929+{
3930+ cairo_t *cr;
3931+
3932+ g_return_val_if_fail (window != NULL, NULL);
3933+
3934+ cr = (cairo_t*) gdk_cairo_create (window);
3935+ cairo_set_line_width (cr, 1.0);
3936+ cairo_set_line_cap (cr, CAIRO_LINE_CAP_SQUARE);
3937+ cairo_set_line_join (cr, CAIRO_LINE_JOIN_MITER);
3938+
3939+ if (area)
3940+ {
3941+ cairo_rectangle (cr, area->x, area->y, area->width, area->height);
3942+ cairo_clip_preserve (cr);
3943+ cairo_new_path (cr);
3944+ }
3945+
3946+ return cr;
3947+}
3948+
3949+static void
3950+adwaita_draw_box (GtkStyle * style,
3951+ GdkWindow * window,
3952+ GtkStateType state_type,
3953+ GtkShadowType shadow_type,
3954+ GdkRectangle * area,
3955+ GtkWidget * widget,
3956+ const gchar * detail,
3957+ gint x,
3958+ gint y,
3959+ gint width,
3960+ gint height)
3961+{
3962+ if (GTK_IS_MENU (widget) &&
3963+ g_strcmp0 (detail, "menu") == 0 &&
3964+ wm_is_fallback ())
3965+ {
3966+ cairo_t *cr = drawable_to_cairo (window, area);
3967+ cairo_pattern_t *pattern = cairo_pattern_create_linear (x, y, x, y + height);
3968+ gdouble stop_1, stop_2, stop_3;
3969+
3970+ stop_1 = MIN (1.0, 6.0 / (gdouble) height);
3971+ stop_2 = MAX (stop_2, 0.33);
3972+ stop_3 = MAX (stop_3, 0.66);
3973+
3974+ cairo_pattern_add_color_stop_rgba (pattern, 0.0, 0.66, 0.66, 0.66, 0.0);
3975+ cairo_pattern_add_color_stop_rgba (pattern, stop_1, 0.66, 0.66, 0.66, 0.25);
3976+ cairo_pattern_add_color_stop_rgba (pattern, stop_2, 0.66, 0.66, 0.66, 0.80);
3977+ cairo_pattern_add_color_stop_rgba (pattern, stop_3, 0.66, 0.66, 0.66, 1.0);
3978+ cairo_pattern_add_color_stop_rgba (pattern, 1.0, 0.66, 0.66, 0.66, 1.0);
3979+ cairo_pattern_set_extend (pattern, CAIRO_EXTEND_REPEAT);
3980+
3981+ cairo_set_source (cr, pattern);
3982+ cairo_rectangle (cr, x, y, width, height);
3983+ cairo_stroke (cr);
3984+
3985+ cairo_destroy (cr);
3986+ cairo_pattern_destroy (pattern);
3987+ }
3988+}
3989+
3990+static void
3991+adwaita_style_init (AdwaitaStyle *style)
3992+{
3993+}
3994+
3995+static void
3996+adwaita_style_class_init (AdwaitaStyleClass * klass)
3997+{
3998+ GtkStyleClass *style_class = GTK_STYLE_CLASS (klass);
3999+
4000+ style_class->draw_box = adwaita_draw_box;
4001+}
4002+
4003+static void
4004+adwaita_style_class_finalize (AdwaitaStyleClass * klass)
4005+{
4006+}
4007+
4008+/**********************************/
4009+/* Register & Initialize RC Style */
4010+/**********************************/
4011+#define ADWAITA_TYPE_RC_STYLE (adwaita_rc_style_get_type ())
4012+#define ADWAITA_RC_STYLE(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), ADWAITA_TYPE_RC_STYLE, AdwaitaRcStyle))
4013+#define ADWAITA_RC_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ADWAITA_TYPE_RC_STYLE, AdwaitaRcStyleClass))
4014+#define ADWAITA_IS_RC_STYLE(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), ADWAITA_TYPE_RC_STYLE))
4015+#define ADWAITA_IS_RC_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ADWAITA_TYPE_RC_STYLE))
4016+#define ADWAITA_RC_STYLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ADWAITA_TYPE_RC_STYLE, AdwaitaRcStyleClass))
4017+
4018+typedef struct
4019+{
4020+ GtkRcStyle parent_instance;
4021+} AdwaitaRcStyle;
4022+
4023+typedef struct
4024+{
4025+ GtkRcStyleClass parent_class;
4026+} AdwaitaRcStyleClass;
4027+
4028+G_DEFINE_DYNAMIC_TYPE (AdwaitaRcStyle, adwaita_rc_style, GTK_TYPE_RC_STYLE)
4029+
4030+static GtkStyle *
4031+adwaita_rc_style_create_style (GtkRcStyle *rc_style)
4032+{
4033+ return g_object_new (ADWAITA_TYPE_STYLE, NULL);
4034+}
4035+
4036+static void
4037+adwaita_rc_style_init (AdwaitaRcStyle *rc_style)
4038+{
4039+}
4040+
4041+static void
4042+adwaita_rc_style_class_init (AdwaitaRcStyleClass * klass)
4043+{
4044+ GtkRcStyleClass *rc_class = GTK_RC_STYLE_CLASS (klass);
4045+
4046+ rc_class->create_style = adwaita_rc_style_create_style;
4047+}
4048+
4049+static void
4050+adwaita_rc_style_class_finalize (AdwaitaRcStyleClass * klass)
4051+{
4052+}
4053+
4054+/****************
4055+ * Engine Hooks *
4056+ ****************/
4057+void
4058+theme_init (GTypeModule * module)
4059+{
4060+ adwaita_rc_style_register_type (module);
4061+ adwaita_style_register_type (module);
4062+}
4063+
4064+void
4065+theme_exit (void)
4066+{
4067+}
4068+
4069+GtkRcStyle *
4070+theme_create_rc_style (void)
4071+{
4072+ return g_object_new (ADWAITA_TYPE_RC_STYLE, NULL);
4073+}
4074
4075=== modified file 'themes/Adwaita/gtk-2.0/gtkrc'
4076--- themes/Adwaita/gtk-2.0/gtkrc 2012-10-02 00:58:28 +0000
4077+++ themes/Adwaita/gtk-2.0/gtkrc 2012-11-22 00:35:57 +0000
4078@@ -107,7 +107,7 @@
4079 recolorable = TRUE
4080 state = NORMAL
4081 shadow = OUT
4082- overlay_file = "Check-Radio/check1.png"
4083+ overlay_file = "Check-Radio/checkbox-unchecked.png"
4084 overlay_stretch = FALSE
4085 }
4086 image
4087@@ -116,7 +116,7 @@
4088 recolorable = TRUE
4089 state = PRELIGHT
4090 shadow = OUT
4091- overlay_file = "Check-Radio/check1.png"
4092+ overlay_file = "Check-Radio/checkbox-unchecked.png"
4093 overlay_stretch = FALSE
4094 }
4095 image
4096@@ -125,7 +125,7 @@
4097 recolorable = TRUE
4098 state = ACTIVE
4099 shadow = OUT
4100- overlay_file = "Check-Radio/check1.png"
4101+ overlay_file = "Check-Radio/checkbox-unchecked.png"
4102 overlay_stretch = FALSE
4103 }
4104 image
4105@@ -134,7 +134,7 @@
4106 recolorable = TRUE
4107 state = INSENSITIVE
4108 shadow = OUT
4109- overlay_file = "Check-Radio/check1.png"
4110+ overlay_file = "Check-Radio/checkbox-unchecked-insensitive.png"
4111 overlay_stretch = FALSE
4112 }
4113 image
4114@@ -143,7 +143,7 @@
4115 recolorable = TRUE
4116 state = NORMAL
4117 shadow = IN
4118- overlay_file = "Check-Radio/check2.png"
4119+ overlay_file = "Check-Radio/checkbox-checked.png"
4120 overlay_stretch = FALSE
4121 }
4122 image
4123@@ -152,7 +152,7 @@
4124 recolorable = TRUE
4125 state = PRELIGHT
4126 shadow = IN
4127- overlay_file = "Check-Radio/check2.png"
4128+ overlay_file = "Check-Radio/checkbox-checked.png"
4129 overlay_stretch = FALSE
4130 }
4131 image
4132@@ -161,7 +161,7 @@
4133 recolorable = TRUE
4134 state = ACTIVE
4135 shadow = IN
4136- overlay_file = "Check-Radio/check2.png"
4137+ overlay_file = "Check-Radio/checkbox-checked.png"
4138 overlay_stretch = FALSE
4139 }
4140 image
4141@@ -170,7 +170,7 @@
4142 recolorable = TRUE
4143 state = INSENSITIVE
4144 shadow = IN
4145- overlay_file = "Check-Radio/check1.png"
4146+ overlay_file = "Check-Radio/checkbox-checked-insensitive.png"
4147 overlay_stretch = FALSE
4148 }
4149
4150@@ -181,7 +181,7 @@
4151 function = OPTION
4152 state = NORMAL
4153 shadow = OUT
4154- overlay_file = "Check-Radio/option1.png"
4155+ overlay_file = "Check-Radio/option-unchecked.png"
4156 overlay_stretch = FALSE
4157 }
4158 image
4159@@ -189,7 +189,7 @@
4160 function = OPTION
4161 state = PRELIGHT
4162 shadow = OUT
4163- overlay_file = "Check-Radio/option1.png"
4164+ overlay_file = "Check-Radio/option-unchecked.png"
4165 overlay_stretch = FALSE
4166 }
4167 image
4168@@ -197,7 +197,7 @@
4169 function = OPTION
4170 state = ACTIVE
4171 shadow = OUT
4172- overlay_file = "Check-Radio/option1.png"
4173+ overlay_file = "Check-Radio/option-unchecked.png"
4174 overlay_stretch = FALSE
4175 }
4176 image
4177@@ -205,7 +205,7 @@
4178 function = OPTION
4179 state = INSENSITIVE
4180 shadow = OUT
4181- overlay_file = "Check-Radio/option1.png"
4182+ overlay_file = "Check-Radio/option-unchecked-insensitive.png"
4183 overlay_stretch = FALSE
4184 }
4185 image
4186@@ -213,7 +213,7 @@
4187 function = OPTION
4188 state = NORMAL
4189 shadow = IN
4190- overlay_file = "Check-Radio/option2.png"
4191+ overlay_file = "Check-Radio/option-checked.png"
4192 overlay_stretch = FALSE
4193 }
4194 image
4195@@ -221,7 +221,7 @@
4196 function = OPTION
4197 state = PRELIGHT
4198 shadow = IN
4199- overlay_file = "Check-Radio/option2.png"
4200+ overlay_file = "Check-Radio/option-checked.png"
4201 overlay_stretch = FALSE
4202 }
4203 image
4204@@ -229,7 +229,7 @@
4205 function = OPTION
4206 state = ACTIVE
4207 shadow = IN
4208- overlay_file = "Check-Radio/option2.png"
4209+ overlay_file = "Check-Radio/option-checked.png"
4210 overlay_stretch = FALSE
4211 }
4212 image
4213@@ -237,7 +237,7 @@
4214 function = OPTION
4215 state = INSENSITIVE
4216 shadow = IN
4217- overlay_file = "Check-Radio/option1.png"
4218+ overlay_file = "Check-Radio/option-checked-insensitive.png"
4219 overlay_stretch = FALSE
4220 }
4221
4222@@ -585,6 +585,13 @@
4223 }
4224 }
4225
4226+style "menu_framed_box"
4227+{
4228+ engine "adwaita"
4229+ {
4230+ }
4231+}
4232+
4233 style "menu_item"
4234 {
4235 xthickness = 2
4236@@ -1935,6 +1942,7 @@
4237
4238 widget_class "*<GtkMenuBar>*" style "menubar"
4239 widget_class "*<GtkMenu>*" style "menu"
4240+widget_class "*<GtkMenu>*" style "menu_framed_box"
4241 widget_class "*<GtkMenuItem>*" style "menu_item"
4242 widget_class "*<GtkMenuBar>.<GtkMenuItem>*" style "menubar_item"
4243 widget_class "*<GtkCheckButton>*" style "checkbutton"
4244
4245=== modified file 'themes/Adwaita/gtk-3.0/Makefile.am'
4246--- themes/Adwaita/gtk-3.0/Makefile.am 2012-05-14 14:14:44 +0000
4247+++ themes/Adwaita/gtk-3.0/Makefile.am 2012-11-22 00:35:57 +0000
4248@@ -1,5 +1,17 @@
4249 SUBDIRS = assets borders
4250
4251+enginedir = $(libdir)/gtk-3.0/$(GTK3_VERSION)/theming-engines
4252+engine_LTLIBRARIES =
4253+engine_LTLIBRARIES += libadwaita.la
4254+
4255+libadwaita_la_SOURCES = \
4256+ adwaita_utils.h \
4257+ adwaita_utils.c \
4258+ adwaita_engine.c
4259+libadwaita_la_CFLAGS = $(GTK3_ENGINE_CFLAGS)
4260+libadwaita_la_LDFLAGS = -module -avoid-version -no-undefined
4261+libadwaita_la_LIBADD = $(GTK3_ENGINE_LIBS)
4262+
4263 themedir = $(datadir)/themes/Adwaita/gtk-3.0
4264 theme_DATA = \
4265 gtk.gresource \
4266@@ -15,6 +27,7 @@
4267 gtk.gresource.xml \
4268 gtk.css \
4269 gtk-dark.css \
4270+ gtk-fallback.css \
4271 gtk-main.css \
4272 gtk-main-common.css \
4273 gtk-main-dark.css \
4274
4275=== modified file 'themes/Adwaita/gtk-3.0/Makefile.in'
4276--- themes/Adwaita/gtk-3.0/Makefile.in 2012-08-08 11:44:00 +0000
4277+++ themes/Adwaita/gtk-3.0/Makefile.in 2012-11-22 00:35:57 +0000
4278@@ -14,6 +14,7 @@
4279
4280 @SET_MAKE@
4281
4282+
4283 VPATH = @srcdir@
4284 am__make_dryrun = \
4285 { \
4286@@ -52,7 +53,7 @@
4287 host_triplet = @host@
4288 subdir = themes/Adwaita/gtk-3.0
4289 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
4290- $(top_srcdir)/mkinstalldirs
4291+ $(top_srcdir)/depcomp $(top_srcdir)/mkinstalldirs
4292 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
4293 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
4294 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
4295@@ -60,20 +61,6 @@
4296 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
4297 CONFIG_CLEAN_FILES =
4298 CONFIG_CLEAN_VPATH_FILES =
4299-SOURCES =
4300-DIST_SOURCES =
4301-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
4302- html-recursive info-recursive install-data-recursive \
4303- install-dvi-recursive install-exec-recursive \
4304- install-html-recursive install-info-recursive \
4305- install-pdf-recursive install-ps-recursive install-recursive \
4306- installcheck-recursive installdirs-recursive pdf-recursive \
4307- ps-recursive uninstall-recursive
4308-am__can_run_installinfo = \
4309- case $$AM_UPDATE_INFO_DIR in \
4310- n|no|NO) false;; \
4311- *) (install-info --version) >/dev/null 2>&1;; \
4312- esac
4313 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
4314 am__vpath_adj = case $$p in \
4315 $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
4316@@ -101,7 +88,68 @@
4317 || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
4318 $(am__cd) "$$dir" && rm -f $$files; }; \
4319 }
4320-am__installdirs = "$(DESTDIR)$(themedir)"
4321+am__installdirs = "$(DESTDIR)$(enginedir)" "$(DESTDIR)$(themedir)"
4322+LTLIBRARIES = $(engine_LTLIBRARIES)
4323+am__DEPENDENCIES_1 =
4324+libadwaita_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
4325+am_libadwaita_la_OBJECTS = libadwaita_la-adwaita_utils.lo \
4326+ libadwaita_la-adwaita_engine.lo
4327+libadwaita_la_OBJECTS = $(am_libadwaita_la_OBJECTS)
4328+AM_V_lt = $(am__v_lt_@AM_V@)
4329+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
4330+am__v_lt_0 = --silent
4331+am__v_lt_1 =
4332+libadwaita_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
4333+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libadwaita_la_CFLAGS) \
4334+ $(CFLAGS) $(libadwaita_la_LDFLAGS) $(LDFLAGS) -o $@
4335+AM_V_P = $(am__v_P_@AM_V@)
4336+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
4337+am__v_P_0 = false
4338+am__v_P_1 = :
4339+AM_V_GEN = $(am__v_GEN_@AM_V@)
4340+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
4341+am__v_GEN_0 = @echo " GEN " $@;
4342+am__v_GEN_1 =
4343+AM_V_at = $(am__v_at_@AM_V@)
4344+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
4345+am__v_at_0 = @
4346+am__v_at_1 =
4347+DEFAULT_INCLUDES = -I.@am__isrc@
4348+depcomp = $(SHELL) $(top_srcdir)/depcomp
4349+am__depfiles_maybe = depfiles
4350+am__mv = mv -f
4351+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
4352+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
4353+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
4354+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
4355+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
4356+ $(AM_CFLAGS) $(CFLAGS)
4357+AM_V_CC = $(am__v_CC_@AM_V@)
4358+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
4359+am__v_CC_0 = @echo " CC " $@;
4360+am__v_CC_1 =
4361+CCLD = $(CC)
4362+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
4363+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
4364+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
4365+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
4366+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
4367+am__v_CCLD_0 = @echo " CCLD " $@;
4368+am__v_CCLD_1 =
4369+SOURCES = $(libadwaita_la_SOURCES)
4370+DIST_SOURCES = $(libadwaita_la_SOURCES)
4371+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
4372+ html-recursive info-recursive install-data-recursive \
4373+ install-dvi-recursive install-exec-recursive \
4374+ install-html-recursive install-info-recursive \
4375+ install-pdf-recursive install-ps-recursive install-recursive \
4376+ installcheck-recursive installdirs-recursive pdf-recursive \
4377+ ps-recursive uninstall-recursive
4378+am__can_run_installinfo = \
4379+ case $$AM_UPDATE_INFO_DIR in \
4380+ n|no|NO) false;; \
4381+ *) (install-info --version) >/dev/null 2>&1;; \
4382+ esac
4383 DATA = $(theme_DATA)
4384 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
4385 distclean-recursive maintainer-clean-recursive
4386@@ -159,8 +207,6 @@
4387 DATADIRNAME = @DATADIRNAME@
4388 DEFS = @DEFS@
4389 DEPDIR = @DEPDIR@
4390-DEPENDENCIES_CFLAGS = @DEPENDENCIES_CFLAGS@
4391-DEPENDENCIES_LIBS = @DEPENDENCIES_LIBS@
4392 DLLTOOL = @DLLTOOL@
4393 DSYMUTIL = @DSYMUTIL@
4394 DUMPBIN = @DUMPBIN@
4395@@ -180,8 +226,13 @@
4396 GMSGFMT = @GMSGFMT@
4397 GOBJECT_QUERY = @GOBJECT_QUERY@
4398 GREP = @GREP@
4399+GTK2_ENGINE_CFLAGS = @GTK2_ENGINE_CFLAGS@
4400+GTK2_ENGINE_LIBS = @GTK2_ENGINE_LIBS@
4401+GTK2_VERSION = @GTK2_VERSION@
4402+GTK3_ENGINE_CFLAGS = @GTK3_ENGINE_CFLAGS@
4403+GTK3_ENGINE_LIBS = @GTK3_ENGINE_LIBS@
4404+GTK3_VERSION = @GTK3_VERSION@
4405 GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
4406-GTK_VERSION = @GTK_VERSION@
4407 HIGHCONTRAST_CFLAGS = @HIGHCONTRAST_CFLAGS@
4408 HIGHCONTRAST_LIBS = @HIGHCONTRAST_LIBS@
4409 INSTALL = @INSTALL@
4410@@ -298,6 +349,16 @@
4411 top_builddir = @top_builddir@
4412 top_srcdir = @top_srcdir@
4413 SUBDIRS = assets borders
4414+enginedir = $(libdir)/gtk-3.0/$(GTK3_VERSION)/theming-engines
4415+engine_LTLIBRARIES = libadwaita.la
4416+libadwaita_la_SOURCES = \
4417+ adwaita_utils.h \
4418+ adwaita_utils.c \
4419+ adwaita_engine.c
4420+
4421+libadwaita_la_CFLAGS = $(GTK3_ENGINE_CFLAGS)
4422+libadwaita_la_LDFLAGS = -module -avoid-version -no-undefined
4423+libadwaita_la_LIBADD = $(GTK3_ENGINE_LIBS)
4424 themedir = $(datadir)/themes/Adwaita/gtk-3.0
4425 theme_DATA = \
4426 gtk.gresource \
4427@@ -310,6 +371,7 @@
4428 gtk.gresource.xml \
4429 gtk.css \
4430 gtk-dark.css \
4431+ gtk-fallback.css \
4432 gtk-main.css \
4433 gtk-main-common.css \
4434 gtk-main-dark.css \
4435@@ -328,6 +390,7 @@
4436 all: all-recursive
4437
4438 .SUFFIXES:
4439+.SUFFIXES: .c .lo .o .obj
4440 $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
4441 @for dep in $?; do \
4442 case '$(am__configure_deps)' in \
4443@@ -358,6 +421,86 @@
4444 $(ACLOCAL_M4): $(am__aclocal_m4_deps)
4445 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
4446 $(am__aclocal_m4_deps):
4447+install-engineLTLIBRARIES: $(engine_LTLIBRARIES)
4448+ @$(NORMAL_INSTALL)
4449+ @list='$(engine_LTLIBRARIES)'; test -n "$(enginedir)" || list=; \
4450+ list2=; for p in $$list; do \
4451+ if test -f $$p; then \
4452+ list2="$$list2 $$p"; \
4453+ else :; fi; \
4454+ done; \
4455+ test -z "$$list2" || { \
4456+ echo " $(MKDIR_P) '$(DESTDIR)$(enginedir)'"; \
4457+ $(MKDIR_P) "$(DESTDIR)$(enginedir)" || exit 1; \
4458+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(enginedir)'"; \
4459+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(enginedir)"; \
4460+ }
4461+
4462+uninstall-engineLTLIBRARIES:
4463+ @$(NORMAL_UNINSTALL)
4464+ @list='$(engine_LTLIBRARIES)'; test -n "$(enginedir)" || list=; \
4465+ for p in $$list; do \
4466+ $(am__strip_dir) \
4467+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(enginedir)/$$f'"; \
4468+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(enginedir)/$$f"; \
4469+ done
4470+
4471+clean-engineLTLIBRARIES:
4472+ -test -z "$(engine_LTLIBRARIES)" || rm -f $(engine_LTLIBRARIES)
4473+ @list='$(engine_LTLIBRARIES)'; \
4474+ locs=`for p in $$list; do echo $$p; done | \
4475+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
4476+ sort -u`; \
4477+ test -z "$$locs" || { \
4478+ echo rm -f $${locs}; \
4479+ rm -f $${locs}; \
4480+ }
4481+libadwaita.la: $(libadwaita_la_OBJECTS) $(libadwaita_la_DEPENDENCIES) $(EXTRA_libadwaita_la_DEPENDENCIES)
4482+ $(AM_V_CCLD)$(libadwaita_la_LINK) -rpath $(enginedir) $(libadwaita_la_OBJECTS) $(libadwaita_la_LIBADD) $(LIBS)
4483+
4484+mostlyclean-compile:
4485+ -rm -f *.$(OBJEXT)
4486+
4487+distclean-compile:
4488+ -rm -f *.tab.c
4489+
4490+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libadwaita_la-adwaita_engine.Plo@am__quote@
4491+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libadwaita_la-adwaita_utils.Plo@am__quote@
4492+
4493+.c.o:
4494+@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
4495+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
4496+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
4497+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
4498+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $<
4499+
4500+.c.obj:
4501+@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
4502+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
4503+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
4504+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
4505+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
4506+
4507+.c.lo:
4508+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
4509+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
4510+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
4511+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
4512+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
4513+
4514+libadwaita_la-adwaita_utils.lo: adwaita_utils.c
4515+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libadwaita_la_CFLAGS) $(CFLAGS) -MT libadwaita_la-adwaita_utils.lo -MD -MP -MF $(DEPDIR)/libadwaita_la-adwaita_utils.Tpo -c -o libadwaita_la-adwaita_utils.lo `test -f 'adwaita_utils.c' || echo '$(srcdir)/'`adwaita_utils.c
4516+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libadwaita_la-adwaita_utils.Tpo $(DEPDIR)/libadwaita_la-adwaita_utils.Plo
4517+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='adwaita_utils.c' object='libadwaita_la-adwaita_utils.lo' libtool=yes @AMDEPBACKSLASH@
4518+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
4519+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libadwaita_la_CFLAGS) $(CFLAGS) -c -o libadwaita_la-adwaita_utils.lo `test -f 'adwaita_utils.c' || echo '$(srcdir)/'`adwaita_utils.c
4520+
4521+libadwaita_la-adwaita_engine.lo: adwaita_engine.c
4522+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libadwaita_la_CFLAGS) $(CFLAGS) -MT libadwaita_la-adwaita_engine.lo -MD -MP -MF $(DEPDIR)/libadwaita_la-adwaita_engine.Tpo -c -o libadwaita_la-adwaita_engine.lo `test -f 'adwaita_engine.c' || echo '$(srcdir)/'`adwaita_engine.c
4523+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libadwaita_la-adwaita_engine.Tpo $(DEPDIR)/libadwaita_la-adwaita_engine.Plo
4524+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='adwaita_engine.c' object='libadwaita_la-adwaita_engine.lo' libtool=yes @AMDEPBACKSLASH@
4525+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
4526+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libadwaita_la_CFLAGS) $(CFLAGS) -c -o libadwaita_la-adwaita_engine.lo `test -f 'adwaita_engine.c' || echo '$(srcdir)/'`adwaita_engine.c
4527
4528 mostlyclean-libtool:
4529 -rm -f *.lo
4530@@ -569,10 +712,10 @@
4531 done
4532 check-am: all-am
4533 check: check-recursive
4534-all-am: Makefile $(DATA)
4535+all-am: Makefile $(LTLIBRARIES) $(DATA)
4536 installdirs: installdirs-recursive
4537 installdirs-am:
4538- for dir in "$(DESTDIR)$(themedir)"; do \
4539+ for dir in "$(DESTDIR)$(enginedir)" "$(DESTDIR)$(themedir)"; do \
4540 test -z "$$dir" || $(MKDIR_P) "$$dir"; \
4541 done
4542 install: install-recursive
4543@@ -608,11 +751,14 @@
4544 @echo "it deletes files that may require special tools to rebuild."
4545 clean: clean-recursive
4546
4547-clean-am: clean-generic clean-libtool mostlyclean-am
4548+clean-am: clean-engineLTLIBRARIES clean-generic clean-libtool \
4549+ mostlyclean-am
4550
4551 distclean: distclean-recursive
4552+ -rm -rf ./$(DEPDIR)
4553 -rm -f Makefile
4554-distclean-am: clean-am distclean-generic distclean-tags
4555+distclean-am: clean-am distclean-compile distclean-generic \
4556+ distclean-tags
4557
4558 dvi: dvi-recursive
4559
4560@@ -626,7 +772,7 @@
4561
4562 info-am:
4563
4564-install-data-am: install-themeDATA
4565+install-data-am: install-engineLTLIBRARIES install-themeDATA
4566
4567 install-dvi: install-dvi-recursive
4568
4569@@ -655,12 +801,14 @@
4570 installcheck-am:
4571
4572 maintainer-clean: maintainer-clean-recursive
4573+ -rm -rf ./$(DEPDIR)
4574 -rm -f Makefile
4575 maintainer-clean-am: distclean-am maintainer-clean-generic
4576
4577 mostlyclean: mostlyclean-recursive
4578
4579-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
4580+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
4581+ mostlyclean-libtool
4582
4583 pdf: pdf-recursive
4584
4585@@ -670,26 +818,28 @@
4586
4587 ps-am:
4588
4589-uninstall-am: uninstall-themeDATA
4590+uninstall-am: uninstall-engineLTLIBRARIES uninstall-themeDATA
4591
4592 .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \
4593 cscopelist-recursive ctags-recursive install-am install-strip \
4594 tags-recursive
4595
4596 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
4597- all all-am check check-am clean clean-generic clean-libtool \
4598- cscopelist cscopelist-recursive ctags ctags-recursive \
4599- distclean distclean-generic distclean-libtool distclean-tags \
4600- distdir dvi dvi-am html html-am info info-am install \
4601- install-am install-data install-data-am install-dvi \
4602- install-dvi-am install-exec install-exec-am install-html \
4603- install-html-am install-info install-info-am install-man \
4604- install-pdf install-pdf-am install-ps install-ps-am \
4605- install-strip install-themeDATA installcheck installcheck-am \
4606- installdirs installdirs-am maintainer-clean \
4607- maintainer-clean-generic mostlyclean mostlyclean-generic \
4608- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
4609- uninstall uninstall-am uninstall-themeDATA
4610+ all all-am check check-am clean clean-engineLTLIBRARIES \
4611+ clean-generic clean-libtool cscopelist cscopelist-recursive \
4612+ ctags ctags-recursive distclean distclean-compile \
4613+ distclean-generic distclean-libtool distclean-tags distdir dvi \
4614+ dvi-am html html-am info info-am install install-am \
4615+ install-data install-data-am install-dvi install-dvi-am \
4616+ install-engineLTLIBRARIES install-exec install-exec-am \
4617+ install-html install-html-am install-info install-info-am \
4618+ install-man install-pdf install-pdf-am install-ps \
4619+ install-ps-am install-strip install-themeDATA installcheck \
4620+ installcheck-am installdirs installdirs-am maintainer-clean \
4621+ maintainer-clean-generic mostlyclean mostlyclean-compile \
4622+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
4623+ tags tags-recursive uninstall uninstall-am \
4624+ uninstall-engineLTLIBRARIES uninstall-themeDATA
4625
4626
4627 gtk.gresource: gtk.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies $(srcdir)/gtk.gresource.xml)
4628
4629=== added file 'themes/Adwaita/gtk-3.0/adwaita_engine.c'
4630--- themes/Adwaita/gtk-3.0/adwaita_engine.c 1970-01-01 00:00:00 +0000
4631+++ themes/Adwaita/gtk-3.0/adwaita_engine.c 2012-11-22 00:35:57 +0000
4632@@ -0,0 +1,536 @@
4633+/* Adwaita - a GTK+ engine
4634+ *
4635+ * Copyright (C) 2011 Carlos Garnacho <carlosg@gnome.org>
4636+ * Copyright (C) 2011 Red Hat, Inc.
4637+ *
4638+ * This library is free software; you can redistribute it and/or
4639+ * modify it under the terms of the GNU Lesser General Public
4640+ * License as published by the Free Software Foundation; either
4641+ * version 2.1 of the License, or (at your option) any later version.
4642+ *
4643+ * This library is distributed in the hope that it will be useful,
4644+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
4645+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
4646+ * Lesser General Public License for more details.
4647+ *
4648+ * You should have received a copy of the GNU Lesser General Public
4649+ * License along with this library; if not, write to the Free Software
4650+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
4651+ *
4652+ * Authors: Carlos Garnacho <carlosg@gnome.org>
4653+ * Cosimo Cecchi <cosimoc@gnome.org>
4654+ *
4655+ * Project contact: <gnome-themes-list@gnome.org>
4656+ */
4657+
4658+#include <gtk/gtk.h>
4659+#include <gmodule.h>
4660+#include <math.h>
4661+#include <cairo-gobject.h>
4662+
4663+#ifdef GDK_WINDOWING_X11
4664+#include <gdk/gdkx.h>
4665+#endif
4666+
4667+#include "adwaita_utils.h"
4668+
4669+#define ADWAITA_NAMESPACE "adwaita"
4670+
4671+typedef struct _AdwaitaEngine AdwaitaEngine;
4672+typedef struct _AdwaitaEngineClass AdwaitaEngineClass;
4673+
4674+struct _AdwaitaEngine
4675+{
4676+ GtkThemingEngine parent_object;
4677+
4678+ guint wm_watch_id;
4679+ GtkCssProvider *fallback_provider;
4680+};
4681+
4682+struct _AdwaitaEngineClass
4683+{
4684+ GtkThemingEngineClass parent_class;
4685+};
4686+
4687+#define ADWAITA_TYPE_ENGINE (adwaita_engine_get_type ())
4688+#define ADWAITA_ENGINE(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), ADWAITA_TYPE_ENGINE, AdwaitaEngine))
4689+#define ADWAITA_ENGINE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ADWAITA_TYPE_ENGINE, AdwaitaEngineClass))
4690+#define ADWAITA_IS_ENGINE(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), ADWAITA_TYPE_ENGINE))
4691+#define ADWAITA_IS_ENGINE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ADWAITA_TYPE_ENGINE))
4692+#define ADWAITA_ENGINE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ADWAITA_TYPE_ENGINE, AdwaitaEngineClass))
4693+
4694+GType adwaita_engine_get_type (void) G_GNUC_CONST;
4695+void adwaita_engine_register_types (GTypeModule *module);
4696+
4697+G_DEFINE_DYNAMIC_TYPE (AdwaitaEngine, adwaita_engine, GTK_TYPE_THEMING_ENGINE)
4698+
4699+void
4700+adwaita_engine_register_types (GTypeModule *module)
4701+{
4702+ adwaita_engine_register_type (module);
4703+}
4704+
4705+static void
4706+fallback_provider_remove (AdwaitaEngine *self)
4707+{
4708+ GdkScreen *screen;
4709+
4710+ if (self->fallback_provider == NULL)
4711+ return;
4712+
4713+ screen = gdk_screen_get_default ();
4714+ gtk_style_context_remove_provider_for_screen
4715+ (screen, GTK_STYLE_PROVIDER (self->fallback_provider));
4716+ g_clear_object (&self->fallback_provider);
4717+}
4718+
4719+static void
4720+fallback_provider_add (AdwaitaEngine *self)
4721+{
4722+ GResource *resource;
4723+ GtkCssProvider *provider;
4724+ GError *error = NULL;
4725+ GdkScreen *screen;
4726+
4727+ if (self->fallback_provider != NULL)
4728+ return;
4729+
4730+ resource = g_resource_load ("/org/gnome/adwaita/gtk-fallback.css", NULL);
4731+ /* Don't spew errors here, this happens while hacking the theme */
4732+ if (resource == NULL)
4733+ return;
4734+
4735+ provider = gtk_css_provider_new ();
4736+ gtk_css_provider_load_from_resource (provider, resource, &error);
4737+ g_object_unref (resource);
4738+
4739+ if (error != NULL)
4740+ {
4741+ g_warning ("Can't load fallback CSS resource: %s", error->message);
4742+ g_error_free (error);
4743+ g_object_unref (provider);
4744+ return;
4745+ }
4746+
4747+ screen = gdk_screen_get_default ();
4748+ gtk_style_context_add_provider_for_screen
4749+ (screen, GTK_STYLE_PROVIDER (provider), GTK_STYLE_PROVIDER_PRIORITY_THEME);
4750+ self->fallback_provider = provider;
4751+}
4752+
4753+static void
4754+adwaita_engine_wm_changed (AdwaitaEngine *self)
4755+{
4756+ gboolean is_fallback = TRUE;
4757+
4758+#ifdef GDK_WINDOWING_X11
4759+ const gchar *name;
4760+ name = gdk_x11_screen_get_window_manager_name (gdk_screen_get_default ());
4761+ is_fallback = (g_strcmp0 (name, "GNOME Shell") != 0);
4762+#endif
4763+
4764+ if (is_fallback)
4765+ fallback_provider_add (self);
4766+ else
4767+ fallback_provider_remove (self);
4768+}
4769+
4770+static void
4771+adwaita_engine_finalize (GObject *obj)
4772+{
4773+ AdwaitaEngine *self = ADWAITA_ENGINE (obj);
4774+
4775+ if (self->wm_watch_id != 0)
4776+ {
4777+ g_signal_handler_disconnect (gdk_screen_get_default (), self->wm_watch_id);
4778+ self->wm_watch_id = 0;
4779+ }
4780+
4781+ fallback_provider_remove (self);
4782+
4783+ G_OBJECT_CLASS (adwaita_engine_parent_class)->finalize (obj);
4784+}
4785+
4786+static void
4787+adwaita_engine_init (AdwaitaEngine *self)
4788+{
4789+#ifdef GDK_WINDOWING_X11
4790+ GdkScreen *screen = gdk_screen_get_default ();
4791+
4792+ self->wm_watch_id =
4793+ g_signal_connect_swapped (screen, "window-manager-changed",
4794+ G_CALLBACK (adwaita_engine_wm_changed), self);
4795+#endif
4796+
4797+ adwaita_engine_wm_changed (self);
4798+}
4799+
4800+static void
4801+adwaita_engine_render_arrow (GtkThemingEngine *engine,
4802+ cairo_t *cr,
4803+ gdouble angle,
4804+ gdouble x,
4805+ gdouble y,
4806+ gdouble size)
4807+{
4808+ double line_width;
4809+ GtkStateFlags state;
4810+ GdkRGBA color;
4811+
4812+ cairo_save (cr);
4813+
4814+ line_width = size / 3.0 / sqrt (2);
4815+ cairo_set_line_width (cr, line_width);
4816+ cairo_set_line_join (cr, CAIRO_LINE_JOIN_ROUND);
4817+ cairo_set_line_cap (cr, CAIRO_LINE_CAP_ROUND);
4818+
4819+ cairo_translate (cr, x + size / 2.0, y + size / 2.0);
4820+ cairo_rotate (cr, angle - G_PI_2);
4821+ cairo_translate (cr, size / 4.0, 0);
4822+
4823+ cairo_scale (cr,
4824+ (size / (size + line_width)),
4825+ (size / (size + line_width)));
4826+
4827+ cairo_move_to (cr, -size / 2.0, -size / 2.0);
4828+ cairo_rel_line_to (cr, size / 2.0, size / 2.0);
4829+ cairo_rel_line_to (cr, - size / 2.0, size / 2.0);
4830+
4831+ state = gtk_theming_engine_get_state (engine);
4832+ gtk_theming_engine_get_color (engine, state, &color);
4833+ gdk_cairo_set_source_rgba (cr, &color);
4834+ cairo_stroke (cr);
4835+
4836+ cairo_restore (cr);
4837+}
4838+
4839+static void
4840+adwaita_engine_render_focus (GtkThemingEngine *engine,
4841+ cairo_t *cr,
4842+ gdouble x,
4843+ gdouble y,
4844+ gdouble width,
4845+ gdouble height)
4846+{
4847+ GdkRGBA *border_color = NULL;
4848+ GtkStateFlags state;
4849+ gint line_width, focus_pad;
4850+ gint border_radius;
4851+ double dashes[2] = { 2.0, 0.2 };
4852+ const GtkWidgetPath *path;
4853+ GtkBorderStyle border_style;
4854+
4855+ path = gtk_theming_engine_get_path (engine);
4856+ state = gtk_theming_engine_get_state (engine);
4857+ gtk_theming_engine_get (engine, state,
4858+ "outline-color", &border_color,
4859+ "outline-style", &border_style,
4860+ "outline-offset", &border_radius,
4861+ NULL);
4862+
4863+ gtk_theming_engine_get_style (engine,
4864+ "focus-line-width", &line_width,
4865+ "focus-padding", &focus_pad,
4866+ NULL);
4867+
4868+ /* as we render the tab smaller than the whole allocation, we need
4869+ * to recenter and resize the focus on the tab.
4870+ */
4871+ if (gtk_theming_engine_has_class (engine, GTK_STYLE_CLASS_NOTEBOOK) &&
4872+ gtk_theming_engine_has_region (engine, GTK_STYLE_REGION_TAB, NULL))
4873+ {
4874+ y += 3.0;
4875+ height -= 3.0;
4876+ }
4877+
4878+ /* the treeview rows don't change allocation when modifying focus-padding,
4879+ * so we have to move the focus ring inside the allocated area manually.
4880+ */
4881+ if (gtk_widget_path_is_type (path, GTK_TYPE_TREE_VIEW))
4882+ {
4883+ x += focus_pad;
4884+ y += focus_pad;
4885+ width -= 2 * focus_pad;
4886+ height -= 2 * focus_pad;
4887+ }
4888+
4889+ cairo_save (cr);
4890+ cairo_set_line_width (cr, line_width);
4891+
4892+ if (line_width > 1)
4893+ _cairo_round_rectangle_sides (cr, border_radius,
4894+ x, y, width, height,
4895+ SIDE_ALL, GTK_JUNCTION_NONE);
4896+ else
4897+ _cairo_round_rectangle_sides (cr, border_radius,
4898+ x + 0.5, y + 0.5,
4899+ width - 1, height - 1,
4900+ SIDE_ALL, GTK_JUNCTION_NONE);
4901+
4902+ if (border_style == GTK_BORDER_STYLE_DASHED)
4903+ cairo_set_dash (cr, dashes, 1, 0.0);
4904+
4905+ if (border_color != NULL)
4906+ gdk_cairo_set_source_rgba (cr, border_color);
4907+
4908+ cairo_stroke (cr);
4909+ cairo_restore (cr);
4910+
4911+ if (border_color != NULL)
4912+ gdk_rgba_free (border_color);
4913+}
4914+
4915+#define NOTEBOOK_TAB_TOP_MARGIN 3.0
4916+
4917+static void
4918+draw_tab_shape (cairo_t *cr,
4919+ gdouble curve_width,
4920+ gdouble x,
4921+ gdouble y,
4922+ gdouble width,
4923+ gdouble height)
4924+{
4925+ cairo_move_to (cr, x, height);
4926+
4927+ cairo_arc (cr,
4928+ x + curve_width, y + 3.0,
4929+ 2.5,
4930+ G_PI, G_PI + G_PI_2);
4931+
4932+ cairo_arc (cr,
4933+ x + width - curve_width, y + 3.0,
4934+ 2.5,
4935+ G_PI + G_PI_2, 2 * G_PI);
4936+
4937+ cairo_line_to (cr, x + width, height);
4938+}
4939+
4940+static void
4941+render_notebook_extension (GtkThemingEngine *engine,
4942+ cairo_t *cr,
4943+ gdouble x,
4944+ gdouble y,
4945+ gdouble width,
4946+ gdouble height,
4947+ GtkPositionType gap_side)
4948+{
4949+ gint tab_curvature, border_width;
4950+ GdkRGBA border_color, background_color;
4951+ GtkStateFlags state;
4952+ gdouble angle = 0;
4953+ cairo_pattern_t *pattern = NULL;
4954+ gboolean is_active;
4955+
4956+ gtk_theming_engine_get_style (engine,
4957+ "tab-curvature", &tab_curvature,
4958+ NULL);
4959+ state = gtk_theming_engine_get_state (engine);
4960+ gtk_theming_engine_get_background_color (engine, state, &background_color);
4961+ gtk_theming_engine_get_border_color (engine, state, &border_color);
4962+ gtk_theming_engine_get (engine, state,
4963+ "border-image-source", &pattern,
4964+ NULL);
4965+
4966+ is_active = (state & GTK_STATE_FLAG_ACTIVE);
4967+ border_width = 1.0;
4968+
4969+ cairo_save (cr);
4970+ cairo_set_line_width (cr, border_width);
4971+
4972+ if (gap_side == GTK_POS_BOTTOM)
4973+ x += border_width / 2;
4974+ else if (gap_side == GTK_POS_TOP)
4975+ x -= border_width / 2;
4976+
4977+ if (gap_side == GTK_POS_TOP)
4978+ {
4979+ angle = G_PI;
4980+ cairo_translate (cr, x + width, y + height - NOTEBOOK_TAB_TOP_MARGIN - border_width);
4981+ }
4982+ else
4983+ {
4984+ cairo_translate (cr, x, y + NOTEBOOK_TAB_TOP_MARGIN + border_width);
4985+ }
4986+
4987+ cairo_rotate (cr, angle);
4988+
4989+ width -= border_width;
4990+ height -= NOTEBOOK_TAB_TOP_MARGIN + border_width;
4991+
4992+ /* draw the tab shape and clip the background inside it */
4993+ cairo_save (cr);
4994+ draw_tab_shape (cr, tab_curvature,
4995+ 0, 0.5,
4996+ width, is_active ? (height + 1.0) : (height));
4997+ cairo_clip (cr);
4998+
4999+ GTK_THEMING_ENGINE_CLASS (adwaita_engine_parent_class)->render_background
5000+ (engine, cr, 0, 0.5,
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches