[arch-commits] Commit in lxappearance/repos (8 files)

Bartłomiej Piotrowski bpiotrowski at nymeria.archlinux.org
Wed Nov 20 09:52:30 UTC 2013


    Date: Wednesday, November 20, 2013 @ 10:52:30
  Author: bpiotrowski
Revision: 101232

archrelease: copy trunk to community-i686, community-x86_64

Added:
  lxappearance/repos/community-i686/PKGBUILD
    (from rev 101231, lxappearance/trunk/PKGBUILD)
  lxappearance/repos/community-i686/gtk-3.0.patch
    (from rev 101231, lxappearance/trunk/gtk-3.0.patch)
  lxappearance/repos/community-x86_64/PKGBUILD
    (from rev 101231, lxappearance/trunk/PKGBUILD)
  lxappearance/repos/community-x86_64/gtk-3.0.patch
    (from rev 101231, lxappearance/trunk/gtk-3.0.patch)
Deleted:
  lxappearance/repos/community-i686/PKGBUILD
  lxappearance/repos/community-i686/gtk-3.0.patch
  lxappearance/repos/community-x86_64/PKGBUILD
  lxappearance/repos/community-x86_64/gtk-3.0.patch

--------------------------------+
 /PKGBUILD                      |   58 ++++++++++
 /gtk-3.0.patch                 |  222 +++++++++++++++++++++++++++++++++++++++
 community-i686/PKGBUILD        |   28 ----
 community-i686/gtk-3.0.patch   |  111 -------------------
 community-x86_64/PKGBUILD      |   28 ----
 community-x86_64/gtk-3.0.patch |  111 -------------------
 6 files changed, 280 insertions(+), 278 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2013-11-20 09:52:15 UTC (rev 101231)
+++ community-i686/PKGBUILD	2013-11-20 09:52:30 UTC (rev 101232)
@@ -1,28 +0,0 @@
-#$Id$
-# Maintainer: Bartłomiej Piotrowski <barthalion at gmail.com>
-# Contributor: Angel Velasquez <angvp at archlinux.org>  
-# Contributor: Geoffroy Carrier <geoffroy.carrier at koon.fr>
-
-pkgname=lxappearance
-pkgver=0.5.3
-pkgrel=1
-pkgdesc='Feature-rich GTK+ theme switcher of the LXDE Desktop'
-arch=('i686' 'x86_64')
-license=('GPL2')
-url='http://lxde.org/'
-groups=('lxde')
-depends=('gtk2')
-makedepends=('intltool')
-source=(http://downloads.sourceforge.net/sourceforge/lxde/${pkgname}-${pkgver}.tar.gz)
-md5sums=('9dfdc9bd45519d51b9df2ad6650c36f5')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --sysconfdir=/etc --prefix=/usr 
-  make 
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install 
-}

Copied: lxappearance/repos/community-i686/PKGBUILD (from rev 101231, lxappearance/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2013-11-20 09:52:30 UTC (rev 101232)
@@ -0,0 +1,29 @@
+#$Id$
+# Maintainer: Bartłomiej Piotrowski <barthalion at gmail.com>
+# Contributor: Angel Velasquez <angvp at archlinux.org>  
+# Contributor: Geoffroy Carrier <geoffroy.carrier at koon.fr>
+
+pkgname=lxappearance
+pkgver=0.5.3
+pkgrel=2
+pkgdesc='Feature-rich GTK+ theme switcher of the LXDE Desktop'
+arch=('i686' 'x86_64')
+license=('GPL2')
+url='http://lxde.org/'
+groups=('lxde')
+depends=('gtk2' 'dbus-glib')
+makedepends=('intltool')
+source=(http://downloads.sourceforge.net/sourceforge/lxde/${pkgname}-${pkgver}.tar.gz)
+md5sums=('9dfdc9bd45519d51b9df2ad6650c36f5')
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --sysconfdir=/etc --prefix=/usr \
+    --enable-dbus
+  make 
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install 
+}

Deleted: community-i686/gtk-3.0.patch
===================================================================
--- community-i686/gtk-3.0.patch	2013-11-20 09:52:15 UTC (rev 101231)
+++ community-i686/gtk-3.0.patch	2013-11-20 09:52:30 UTC (rev 101232)
@@ -1,111 +0,0 @@
---- src/lxappearance.c	2011-07-29 16:50:19.000000000 +0200
-+++ src/lxappearance1.c	2011-07-30 18:51:40.323368701 +0200
-@@ -153,21 +153,33 @@
- 
-     char* file_path = g_build_filename(g_get_home_dir(), ".gtkrc-2.0", NULL);
-     GString* content = g_string_sized_new(512);
-+    GString* content3 = g_string_sized_new(512);
-     g_string_append(content,
-         "# DO NOT EDIT! This file will be overwritten by LXAppearance.\n"
-         "# Any customization should be done in ~/.gtkrc-2.0.mine instead.\n\n");
-+    g_string_append(content3, "[Settings]\n"
-+        "# DO NOT EDIT! This file will be overwritten by LXAppearance.\n");
-+    
-     if(app.widget_theme)
-         g_string_append_printf(content,
-             "gtk-theme-name=\"%s\"\n", app.widget_theme);
-+        g_string_append_printf(content3,
-+            "gtk-theme-name = %s\n", app.widget_theme);
-     if(app.icon_theme)
-         g_string_append_printf(content,
--            "gtk-icon-theme-name=\"%s\"\n", app.icon_theme);
-+            "gtk-icon-theme-name=\"%s\"\n", app.icon_theme);        
-+        g_string_append_printf(content3,
-+            "gtk-icon-theme-name = %s\n", app.icon_theme);
-     if(app.default_font)
-         g_string_append_printf(content,
-             "gtk-font-name=\"%s\"\n", app.default_font);
-+        g_string_append_printf(content3,
-+            "gtk-font-name = %s\n", app.default_font);
-     if(app.cursor_theme)
-         g_string_append_printf(content,
-             "gtk-cursor-theme-name=\"%s\"\n", app.cursor_theme);
-+        g_string_append_printf(content3,
-+            "gtk-cursor-theme-name = %s\n", app.cursor_theme);
-     save_cursor_theme_name();
- 
-     g_string_append_printf(content,
-@@ -196,20 +208,46 @@
-         app.enable_hinting ? 1 : 0
-         );
- 
-+   g_string_append_printf(content3,
-+        "gtk-cursor-theme-size = %d\n"
-+        "gtk-toolbar-style = %s\n"
-+        "gtk-toolbar-icon-size = %s\n"
-+        "gtk-button-images = %d\n"
-+        "gtk-menu-images = %d\n"
-+        "gtk-enable-event-sounds = %d\n"
-+        "gtk-enable-input-feedback-sounds = %d\n"
-+        "gtk-xft-antialias = %d\n"
-+        "gtk-xft-hinting = %d\n",
-+        app.cursor_theme_size,
-+        tb_styles[app.toolbar_style],
-+        tb_icon_sizes[app.toolbar_icon_size],
-+        app.button_images ? 1 : 0,
-+        app.menu_images ? 1 : 0,
-+        app.enable_event_sound ? 1 : 0,
-+        app.enable_input_feedback ? 1 : 0,
-+        app.enable_antialising ? 1 : 0,
-+        app.enable_hinting ? 1 : 0
-+        );
-+
-     if(app.hinting_style)
-         g_string_append_printf(content,
-             "gtk-xft-hintstyle=\"%s\"\n", app.hinting_style);
-+        g_string_append_printf(content3,
-+            "gtk-xft-hintstyle = %s\n", app.hinting_style);
- 
-     if(app.font_rgba)
-         g_string_append_printf(content,
-             "gtk-xft-rgba=\"%s\"\n", app.font_rgba);
-+        g_string_append_printf(content3,
-+            "gtk-xft-rgba = %s\n", app.font_rgba);
- 
-     if(app.color_scheme)
-     {
-         char* escaped = g_strescape(app.color_scheme, NULL);
-         g_string_append_printf(content,
--            "gtk-color-scheme=\"%s\"\n",
--            escaped);
-+            "gtk-color-scheme=\"%s\"\n", escaped);
-+        g_string_append_printf(content3,
-+            "gtk-color-scheme = %s\n", escaped);
-         g_free(escaped);
-     }
- 
-@@ -218,20 +256,20 @@
-         g_get_home_dir());
- 
-     g_file_set_contents(file_path, content->str, content->len, NULL);
-+    g_string_free(content, TRUE);
- 
-     /* Save also for GTK3 */
--    g_string_prepend(content, "[Settings] \n");
--    char* file_path_gtk3 = g_build_filename(g_get_home_dir(), "gtk-3.0", NULL);
--    char* file_path_settings = g_build_filename(g_get_home_dir(), "gtk-3.0", "settings.ini", NULL);
-+    char* file_path_gtk3 = g_build_filename(g_get_user_config_dir(), "gtk-3.0", NULL);
-+    char* file_path_settings = g_build_filename(g_get_user_config_dir(), "gtk-3.0", "settings.ini", NULL);
- 
-     if (!g_file_test(file_path_gtk3, G_FILE_TEST_IS_DIR))
-     {
-         g_mkdir_with_parents(file_path_gtk3, 0755);
-     }
- 
--    g_file_set_contents(file_path_settings, content->str, content->len, NULL);
-+    g_file_set_contents(file_path_settings, content3->str, content3->len, NULL);
- 
--    g_string_free(content, TRUE);
-+    g_string_free(content3, TRUE);
-     g_free(file_path);
- }

Copied: lxappearance/repos/community-i686/gtk-3.0.patch (from rev 101231, lxappearance/trunk/gtk-3.0.patch)
===================================================================
--- community-i686/gtk-3.0.patch	                        (rev 0)
+++ community-i686/gtk-3.0.patch	2013-11-20 09:52:30 UTC (rev 101232)
@@ -0,0 +1,111 @@
+--- src/lxappearance.c	2011-07-29 16:50:19.000000000 +0200
++++ src/lxappearance1.c	2011-07-30 18:51:40.323368701 +0200
+@@ -153,21 +153,33 @@
+ 
+     char* file_path = g_build_filename(g_get_home_dir(), ".gtkrc-2.0", NULL);
+     GString* content = g_string_sized_new(512);
++    GString* content3 = g_string_sized_new(512);
+     g_string_append(content,
+         "# DO NOT EDIT! This file will be overwritten by LXAppearance.\n"
+         "# Any customization should be done in ~/.gtkrc-2.0.mine instead.\n\n");
++    g_string_append(content3, "[Settings]\n"
++        "# DO NOT EDIT! This file will be overwritten by LXAppearance.\n");
++    
+     if(app.widget_theme)
+         g_string_append_printf(content,
+             "gtk-theme-name=\"%s\"\n", app.widget_theme);
++        g_string_append_printf(content3,
++            "gtk-theme-name = %s\n", app.widget_theme);
+     if(app.icon_theme)
+         g_string_append_printf(content,
+-            "gtk-icon-theme-name=\"%s\"\n", app.icon_theme);
++            "gtk-icon-theme-name=\"%s\"\n", app.icon_theme);        
++        g_string_append_printf(content3,
++            "gtk-icon-theme-name = %s\n", app.icon_theme);
+     if(app.default_font)
+         g_string_append_printf(content,
+             "gtk-font-name=\"%s\"\n", app.default_font);
++        g_string_append_printf(content3,
++            "gtk-font-name = %s\n", app.default_font);
+     if(app.cursor_theme)
+         g_string_append_printf(content,
+             "gtk-cursor-theme-name=\"%s\"\n", app.cursor_theme);
++        g_string_append_printf(content3,
++            "gtk-cursor-theme-name = %s\n", app.cursor_theme);
+     save_cursor_theme_name();
+ 
+     g_string_append_printf(content,
+@@ -196,20 +208,46 @@
+         app.enable_hinting ? 1 : 0
+         );
+ 
++   g_string_append_printf(content3,
++        "gtk-cursor-theme-size = %d\n"
++        "gtk-toolbar-style = %s\n"
++        "gtk-toolbar-icon-size = %s\n"
++        "gtk-button-images = %d\n"
++        "gtk-menu-images = %d\n"
++        "gtk-enable-event-sounds = %d\n"
++        "gtk-enable-input-feedback-sounds = %d\n"
++        "gtk-xft-antialias = %d\n"
++        "gtk-xft-hinting = %d\n",
++        app.cursor_theme_size,
++        tb_styles[app.toolbar_style],
++        tb_icon_sizes[app.toolbar_icon_size],
++        app.button_images ? 1 : 0,
++        app.menu_images ? 1 : 0,
++        app.enable_event_sound ? 1 : 0,
++        app.enable_input_feedback ? 1 : 0,
++        app.enable_antialising ? 1 : 0,
++        app.enable_hinting ? 1 : 0
++        );
++
+     if(app.hinting_style)
+         g_string_append_printf(content,
+             "gtk-xft-hintstyle=\"%s\"\n", app.hinting_style);
++        g_string_append_printf(content3,
++            "gtk-xft-hintstyle = %s\n", app.hinting_style);
+ 
+     if(app.font_rgba)
+         g_string_append_printf(content,
+             "gtk-xft-rgba=\"%s\"\n", app.font_rgba);
++        g_string_append_printf(content3,
++            "gtk-xft-rgba = %s\n", app.font_rgba);
+ 
+     if(app.color_scheme)
+     {
+         char* escaped = g_strescape(app.color_scheme, NULL);
+         g_string_append_printf(content,
+-            "gtk-color-scheme=\"%s\"\n",
+-            escaped);
++            "gtk-color-scheme=\"%s\"\n", escaped);
++        g_string_append_printf(content3,
++            "gtk-color-scheme = %s\n", escaped);
+         g_free(escaped);
+     }
+ 
+@@ -218,20 +256,20 @@
+         g_get_home_dir());
+ 
+     g_file_set_contents(file_path, content->str, content->len, NULL);
++    g_string_free(content, TRUE);
+ 
+     /* Save also for GTK3 */
+-    g_string_prepend(content, "[Settings] \n");
+-    char* file_path_gtk3 = g_build_filename(g_get_home_dir(), "gtk-3.0", NULL);
+-    char* file_path_settings = g_build_filename(g_get_home_dir(), "gtk-3.0", "settings.ini", NULL);
++    char* file_path_gtk3 = g_build_filename(g_get_user_config_dir(), "gtk-3.0", NULL);
++    char* file_path_settings = g_build_filename(g_get_user_config_dir(), "gtk-3.0", "settings.ini", NULL);
+ 
+     if (!g_file_test(file_path_gtk3, G_FILE_TEST_IS_DIR))
+     {
+         g_mkdir_with_parents(file_path_gtk3, 0755);
+     }
+ 
+-    g_file_set_contents(file_path_settings, content->str, content->len, NULL);
++    g_file_set_contents(file_path_settings, content3->str, content3->len, NULL);
+ 
+-    g_string_free(content, TRUE);
++    g_string_free(content3, TRUE);
+     g_free(file_path);
+ }

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2013-11-20 09:52:15 UTC (rev 101231)
+++ community-x86_64/PKGBUILD	2013-11-20 09:52:30 UTC (rev 101232)
@@ -1,28 +0,0 @@
-#$Id$
-# Maintainer: Bartłomiej Piotrowski <barthalion at gmail.com>
-# Contributor: Angel Velasquez <angvp at archlinux.org>  
-# Contributor: Geoffroy Carrier <geoffroy.carrier at koon.fr>
-
-pkgname=lxappearance
-pkgver=0.5.3
-pkgrel=1
-pkgdesc='Feature-rich GTK+ theme switcher of the LXDE Desktop'
-arch=('i686' 'x86_64')
-license=('GPL2')
-url='http://lxde.org/'
-groups=('lxde')
-depends=('gtk2')
-makedepends=('intltool')
-source=(http://downloads.sourceforge.net/sourceforge/lxde/${pkgname}-${pkgver}.tar.gz)
-md5sums=('9dfdc9bd45519d51b9df2ad6650c36f5')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --sysconfdir=/etc --prefix=/usr 
-  make 
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install 
-}

Copied: lxappearance/repos/community-x86_64/PKGBUILD (from rev 101231, lxappearance/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2013-11-20 09:52:30 UTC (rev 101232)
@@ -0,0 +1,29 @@
+#$Id$
+# Maintainer: Bartłomiej Piotrowski <barthalion at gmail.com>
+# Contributor: Angel Velasquez <angvp at archlinux.org>  
+# Contributor: Geoffroy Carrier <geoffroy.carrier at koon.fr>
+
+pkgname=lxappearance
+pkgver=0.5.3
+pkgrel=2
+pkgdesc='Feature-rich GTK+ theme switcher of the LXDE Desktop'
+arch=('i686' 'x86_64')
+license=('GPL2')
+url='http://lxde.org/'
+groups=('lxde')
+depends=('gtk2' 'dbus-glib')
+makedepends=('intltool')
+source=(http://downloads.sourceforge.net/sourceforge/lxde/${pkgname}-${pkgver}.tar.gz)
+md5sums=('9dfdc9bd45519d51b9df2ad6650c36f5')
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --sysconfdir=/etc --prefix=/usr \
+    --enable-dbus
+  make 
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install 
+}

Deleted: community-x86_64/gtk-3.0.patch
===================================================================
--- community-x86_64/gtk-3.0.patch	2013-11-20 09:52:15 UTC (rev 101231)
+++ community-x86_64/gtk-3.0.patch	2013-11-20 09:52:30 UTC (rev 101232)
@@ -1,111 +0,0 @@
---- src/lxappearance.c	2011-07-29 16:50:19.000000000 +0200
-+++ src/lxappearance1.c	2011-07-30 18:51:40.323368701 +0200
-@@ -153,21 +153,33 @@
- 
-     char* file_path = g_build_filename(g_get_home_dir(), ".gtkrc-2.0", NULL);
-     GString* content = g_string_sized_new(512);
-+    GString* content3 = g_string_sized_new(512);
-     g_string_append(content,
-         "# DO NOT EDIT! This file will be overwritten by LXAppearance.\n"
-         "# Any customization should be done in ~/.gtkrc-2.0.mine instead.\n\n");
-+    g_string_append(content3, "[Settings]\n"
-+        "# DO NOT EDIT! This file will be overwritten by LXAppearance.\n");
-+    
-     if(app.widget_theme)
-         g_string_append_printf(content,
-             "gtk-theme-name=\"%s\"\n", app.widget_theme);
-+        g_string_append_printf(content3,
-+            "gtk-theme-name = %s\n", app.widget_theme);
-     if(app.icon_theme)
-         g_string_append_printf(content,
--            "gtk-icon-theme-name=\"%s\"\n", app.icon_theme);
-+            "gtk-icon-theme-name=\"%s\"\n", app.icon_theme);        
-+        g_string_append_printf(content3,
-+            "gtk-icon-theme-name = %s\n", app.icon_theme);
-     if(app.default_font)
-         g_string_append_printf(content,
-             "gtk-font-name=\"%s\"\n", app.default_font);
-+        g_string_append_printf(content3,
-+            "gtk-font-name = %s\n", app.default_font);
-     if(app.cursor_theme)
-         g_string_append_printf(content,
-             "gtk-cursor-theme-name=\"%s\"\n", app.cursor_theme);
-+        g_string_append_printf(content3,
-+            "gtk-cursor-theme-name = %s\n", app.cursor_theme);
-     save_cursor_theme_name();
- 
-     g_string_append_printf(content,
-@@ -196,20 +208,46 @@
-         app.enable_hinting ? 1 : 0
-         );
- 
-+   g_string_append_printf(content3,
-+        "gtk-cursor-theme-size = %d\n"
-+        "gtk-toolbar-style = %s\n"
-+        "gtk-toolbar-icon-size = %s\n"
-+        "gtk-button-images = %d\n"
-+        "gtk-menu-images = %d\n"
-+        "gtk-enable-event-sounds = %d\n"
-+        "gtk-enable-input-feedback-sounds = %d\n"
-+        "gtk-xft-antialias = %d\n"
-+        "gtk-xft-hinting = %d\n",
-+        app.cursor_theme_size,
-+        tb_styles[app.toolbar_style],
-+        tb_icon_sizes[app.toolbar_icon_size],
-+        app.button_images ? 1 : 0,
-+        app.menu_images ? 1 : 0,
-+        app.enable_event_sound ? 1 : 0,
-+        app.enable_input_feedback ? 1 : 0,
-+        app.enable_antialising ? 1 : 0,
-+        app.enable_hinting ? 1 : 0
-+        );
-+
-     if(app.hinting_style)
-         g_string_append_printf(content,
-             "gtk-xft-hintstyle=\"%s\"\n", app.hinting_style);
-+        g_string_append_printf(content3,
-+            "gtk-xft-hintstyle = %s\n", app.hinting_style);
- 
-     if(app.font_rgba)
-         g_string_append_printf(content,
-             "gtk-xft-rgba=\"%s\"\n", app.font_rgba);
-+        g_string_append_printf(content3,
-+            "gtk-xft-rgba = %s\n", app.font_rgba);
- 
-     if(app.color_scheme)
-     {
-         char* escaped = g_strescape(app.color_scheme, NULL);
-         g_string_append_printf(content,
--            "gtk-color-scheme=\"%s\"\n",
--            escaped);
-+            "gtk-color-scheme=\"%s\"\n", escaped);
-+        g_string_append_printf(content3,
-+            "gtk-color-scheme = %s\n", escaped);
-         g_free(escaped);
-     }
- 
-@@ -218,20 +256,20 @@
-         g_get_home_dir());
- 
-     g_file_set_contents(file_path, content->str, content->len, NULL);
-+    g_string_free(content, TRUE);
- 
-     /* Save also for GTK3 */
--    g_string_prepend(content, "[Settings] \n");
--    char* file_path_gtk3 = g_build_filename(g_get_home_dir(), "gtk-3.0", NULL);
--    char* file_path_settings = g_build_filename(g_get_home_dir(), "gtk-3.0", "settings.ini", NULL);
-+    char* file_path_gtk3 = g_build_filename(g_get_user_config_dir(), "gtk-3.0", NULL);
-+    char* file_path_settings = g_build_filename(g_get_user_config_dir(), "gtk-3.0", "settings.ini", NULL);
- 
-     if (!g_file_test(file_path_gtk3, G_FILE_TEST_IS_DIR))
-     {
-         g_mkdir_with_parents(file_path_gtk3, 0755);
-     }
- 
--    g_file_set_contents(file_path_settings, content->str, content->len, NULL);
-+    g_file_set_contents(file_path_settings, content3->str, content3->len, NULL);
- 
--    g_string_free(content, TRUE);
-+    g_string_free(content3, TRUE);
-     g_free(file_path);
- }

Copied: lxappearance/repos/community-x86_64/gtk-3.0.patch (from rev 101231, lxappearance/trunk/gtk-3.0.patch)
===================================================================
--- community-x86_64/gtk-3.0.patch	                        (rev 0)
+++ community-x86_64/gtk-3.0.patch	2013-11-20 09:52:30 UTC (rev 101232)
@@ -0,0 +1,111 @@
+--- src/lxappearance.c	2011-07-29 16:50:19.000000000 +0200
++++ src/lxappearance1.c	2011-07-30 18:51:40.323368701 +0200
+@@ -153,21 +153,33 @@
+ 
+     char* file_path = g_build_filename(g_get_home_dir(), ".gtkrc-2.0", NULL);
+     GString* content = g_string_sized_new(512);
++    GString* content3 = g_string_sized_new(512);
+     g_string_append(content,
+         "# DO NOT EDIT! This file will be overwritten by LXAppearance.\n"
+         "# Any customization should be done in ~/.gtkrc-2.0.mine instead.\n\n");
++    g_string_append(content3, "[Settings]\n"
++        "# DO NOT EDIT! This file will be overwritten by LXAppearance.\n");
++    
+     if(app.widget_theme)
+         g_string_append_printf(content,
+             "gtk-theme-name=\"%s\"\n", app.widget_theme);
++        g_string_append_printf(content3,
++            "gtk-theme-name = %s\n", app.widget_theme);
+     if(app.icon_theme)
+         g_string_append_printf(content,
+-            "gtk-icon-theme-name=\"%s\"\n", app.icon_theme);
++            "gtk-icon-theme-name=\"%s\"\n", app.icon_theme);        
++        g_string_append_printf(content3,
++            "gtk-icon-theme-name = %s\n", app.icon_theme);
+     if(app.default_font)
+         g_string_append_printf(content,
+             "gtk-font-name=\"%s\"\n", app.default_font);
++        g_string_append_printf(content3,
++            "gtk-font-name = %s\n", app.default_font);
+     if(app.cursor_theme)
+         g_string_append_printf(content,
+             "gtk-cursor-theme-name=\"%s\"\n", app.cursor_theme);
++        g_string_append_printf(content3,
++            "gtk-cursor-theme-name = %s\n", app.cursor_theme);
+     save_cursor_theme_name();
+ 
+     g_string_append_printf(content,
+@@ -196,20 +208,46 @@
+         app.enable_hinting ? 1 : 0
+         );
+ 
++   g_string_append_printf(content3,
++        "gtk-cursor-theme-size = %d\n"
++        "gtk-toolbar-style = %s\n"
++        "gtk-toolbar-icon-size = %s\n"
++        "gtk-button-images = %d\n"
++        "gtk-menu-images = %d\n"
++        "gtk-enable-event-sounds = %d\n"
++        "gtk-enable-input-feedback-sounds = %d\n"
++        "gtk-xft-antialias = %d\n"
++        "gtk-xft-hinting = %d\n",
++        app.cursor_theme_size,
++        tb_styles[app.toolbar_style],
++        tb_icon_sizes[app.toolbar_icon_size],
++        app.button_images ? 1 : 0,
++        app.menu_images ? 1 : 0,
++        app.enable_event_sound ? 1 : 0,
++        app.enable_input_feedback ? 1 : 0,
++        app.enable_antialising ? 1 : 0,
++        app.enable_hinting ? 1 : 0
++        );
++
+     if(app.hinting_style)
+         g_string_append_printf(content,
+             "gtk-xft-hintstyle=\"%s\"\n", app.hinting_style);
++        g_string_append_printf(content3,
++            "gtk-xft-hintstyle = %s\n", app.hinting_style);
+ 
+     if(app.font_rgba)
+         g_string_append_printf(content,
+             "gtk-xft-rgba=\"%s\"\n", app.font_rgba);
++        g_string_append_printf(content3,
++            "gtk-xft-rgba = %s\n", app.font_rgba);
+ 
+     if(app.color_scheme)
+     {
+         char* escaped = g_strescape(app.color_scheme, NULL);
+         g_string_append_printf(content,
+-            "gtk-color-scheme=\"%s\"\n",
+-            escaped);
++            "gtk-color-scheme=\"%s\"\n", escaped);
++        g_string_append_printf(content3,
++            "gtk-color-scheme = %s\n", escaped);
+         g_free(escaped);
+     }
+ 
+@@ -218,20 +256,20 @@
+         g_get_home_dir());
+ 
+     g_file_set_contents(file_path, content->str, content->len, NULL);
++    g_string_free(content, TRUE);
+ 
+     /* Save also for GTK3 */
+-    g_string_prepend(content, "[Settings] \n");
+-    char* file_path_gtk3 = g_build_filename(g_get_home_dir(), "gtk-3.0", NULL);
+-    char* file_path_settings = g_build_filename(g_get_home_dir(), "gtk-3.0", "settings.ini", NULL);
++    char* file_path_gtk3 = g_build_filename(g_get_user_config_dir(), "gtk-3.0", NULL);
++    char* file_path_settings = g_build_filename(g_get_user_config_dir(), "gtk-3.0", "settings.ini", NULL);
+ 
+     if (!g_file_test(file_path_gtk3, G_FILE_TEST_IS_DIR))
+     {
+         g_mkdir_with_parents(file_path_gtk3, 0755);
+     }
+ 
+-    g_file_set_contents(file_path_settings, content->str, content->len, NULL);
++    g_file_set_contents(file_path_settings, content3->str, content3->len, NULL);
+ 
+-    g_string_free(content, TRUE);
++    g_string_free(content3, TRUE);
+     g_free(file_path);
+ }




More information about the arch-commits mailing list