[maemo-commits] [maemo-commits] r8254 - in projects/haf/trunk/maemo-theme-tools: . scripts src
From: mdk at stage.maemo.org mdk at stage.maemo.orgDate: Wed Nov 22 15:04:02 EET 2006
- Previous message: [maemo-commits] r8252 - in projects/haf/trunk: . hildon-theme-cacher hildon-theme-cacher/debian hildon-theme-cacher/scripts hildon-theme-cacher/src
- Next message: [maemo-commits] r8255 - in projects/haf/trunk/maemo-theme-layout-3: . rc
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Author: mdk Date: 2006-11-22 15:04:01 +0200 (Wed, 22 Nov 2006) New Revision: 8254 Removed: projects/haf/trunk/maemo-theme-tools/src/cacher.c Modified: projects/haf/trunk/maemo-theme-tools/ChangeLog projects/haf/trunk/maemo-theme-tools/configure.ac projects/haf/trunk/maemo-theme-tools/scripts/Makefile.am projects/haf/trunk/maemo-theme-tools/scripts/hildon-theme-install projects/haf/trunk/maemo-theme-tools/src/Makefile.am Log: 2006-11-22 Michael Dominic Kostrzewa <michael.kostrzewa at nokia.com> * configure.ac: Removing pedantic flag. * scripts/Makefile.am: * scripts/hildon-theme-install: Removing the caching step (not needed now, will be moved to theme install postinst). * src/Makefile.am: * src/cacher.c: Removing the cacher from the build (moved to hildon-theme-cacher) Modified: projects/haf/trunk/maemo-theme-tools/ChangeLog =================================================================== --- projects/haf/trunk/maemo-theme-tools/ChangeLog 2006-11-22 12:48:12 UTC (rev 8253) +++ projects/haf/trunk/maemo-theme-tools/ChangeLog 2006-11-22 13:04:01 UTC (rev 8254) @@ -1,3 +1,15 @@ +2006-11-22 Michael Dominic Kostrzewa <michael.kostrzewa at nokia.com> + + * configure.ac: Removing pedantic flag. + + * scripts/Makefile.am: + * scripts/hildon-theme-install: Removing the caching step (not needed + now, will be moved to theme install postinst). + + * src/Makefile.am: + * src/cacher.c: Removing the cacher from the build (moved to + hildon-theme-cacher) + 2006-11-21 Michael Dominic Kostrzewa <michael.kostrzewa at nokia.com> * INSTALL: Adding missing. Modified: projects/haf/trunk/maemo-theme-tools/configure.ac =================================================================== --- projects/haf/trunk/maemo-theme-tools/configure.ac 2006-11-22 12:48:12 UTC (rev 8253) +++ projects/haf/trunk/maemo-theme-tools/configure.ac 2006-11-22 13:04:01 UTC (rev 8254) @@ -8,7 +8,7 @@ AC_PROG_INSTALL AC_HEADER_STDC -CFLAGS="$CFLAGS -Wall -pedantic -Wmissing-prototypes -Wmissing-declarations -Werror" +CFLAGS="$CFLAGS -Wall -Wmissing-prototypes -Wmissing-declarations -Werror" GTK_VERSION=2.6.4 Modified: projects/haf/trunk/maemo-theme-tools/scripts/Makefile.am =================================================================== --- projects/haf/trunk/maemo-theme-tools/scripts/Makefile.am 2006-11-22 12:48:12 UTC (rev 8253) +++ projects/haf/trunk/maemo-theme-tools/scripts/Makefile.am 2006-11-22 13:04:01 UTC (rev 8254) @@ -1,3 +1,3 @@ -dist_bin_SCRIPTS = hildon-theme-install +dist_bin_SCRIPTS = hildon-theme-install -MAINTAINERCLEANFILES = Makefile.in +MAINTAINERCLEANFILES = Makefile.in Modified: projects/haf/trunk/maemo-theme-tools/scripts/hildon-theme-install =================================================================== --- projects/haf/trunk/maemo-theme-tools/scripts/hildon-theme-install 2006-11-22 12:48:12 UTC (rev 8253) +++ projects/haf/trunk/maemo-theme-tools/scripts/hildon-theme-install 2006-11-22 13:04:01 UTC (rev 8254) @@ -126,12 +126,6 @@ print "Done!\n"; } -sub generate_cache -{ - print "Generating rc cache...\n"; - `hildon-theme-cacher "$destdir/$themedir/"`; -} - sub add_color_substitutions { # Get some default values in @@ -220,4 +214,3 @@ install_file ("theme.xml", "matchbox"); install_file ("index.theme"); -generate_cache; Modified: projects/haf/trunk/maemo-theme-tools/src/Makefile.am =================================================================== --- projects/haf/trunk/maemo-theme-tools/src/Makefile.am 2006-11-22 12:48:12 UTC (rev 8253) +++ projects/haf/trunk/maemo-theme-tools/src/Makefile.am 2006-11-22 13:04:01 UTC (rev 8254) @@ -1,8 +1,7 @@ bin_PROGRAMS = hildon-theme-slicer \ hildon-theme-colourizer \ hildon-theme-regenerator \ - hildon-theme-outliner \ - hildon-theme-cacher + hildon-theme-outliner # Slicer hildon_theme_slicer_CFLAGS = $(GTK_CFLAGS) -DEXEC_NAME=\"hildon-theme-slicer\" @@ -24,10 +23,4 @@ hildon_theme_outliner_LDADD = $(GTK_LIBS) hildon_theme_outliner_SOURCES = outliner.c common.c -# Cacher -# FIXME: Add "EXEC_NAME" here too -hildon_theme_cacher_CFLAGS = $(GTK_CFLAGS) -hildon_theme_cacher_LDADD = $(GTK_LIBS) -hildon_theme_cacher_SOURCES = cacher.c - MAINTAINERCLEANFILES = Makefile.in Deleted: projects/haf/trunk/maemo-theme-tools/src/cacher.c =================================================================== --- projects/haf/trunk/maemo-theme-tools/src/cacher.c 2006-11-22 12:48:12 UTC (rev 8253) +++ projects/haf/trunk/maemo-theme-tools/src/cacher.c 2006-11-22 13:04:01 UTC (rev 8254) @@ -1,62 +0,0 @@ -/* - * GPL license, Copyright (c) 2006 by Nokia Corporation - * - * Authors: - * Tommi Komulainen <tommi.komulainen at nokia.com> - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation, version 2. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., 59 - * Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - */ - -#include <gtk/gtk.h> - -int - main (int argc, char **argv) -{ - GtkSettings *settings; - int i; - - g_unsetenv ("DISPLAY"); - gtk_init_check (&argc, &argv); - - if (argc < 2) - { - g_printerr ("Usage: %s THEME-DIR...\n", g_get_prgname ()); - return 1; - } - - g_setenv ("GSCANNERCACHE_CREATE", "1", TRUE); - - for (i = 1; i < argc; i++) - { - const char *theme_path = argv[i]; - char *gtkrc; - char *gtkrc_maemo; - - gtkrc = g_build_filename (theme_path, "gtk-2.0", "gtkrc", NULL); - g_print ("%s\n", gtkrc); - gtk_rc_parse (gtkrc); - g_free (gtkrc); - - gtkrc_maemo = g_build_filename (theme_path, "gtk-2.0", "gtkrc.maemo_af_desktop", NULL); - g_print ("%s\n", gtkrc_maemo); - gtk_rc_parse (gtkrc_maemo); - g_free (gtkrc_maemo); - } - - settings = g_object_new (GTK_TYPE_SETTINGS, NULL); - gtk_rc_reparse_all_for_settings (settings, TRUE); - - return 0; -}
- Previous message: [maemo-commits] r8252 - in projects/haf/trunk: . hildon-theme-cacher hildon-theme-cacher/debian hildon-theme-cacher/scripts hildon-theme-cacher/src
- Next message: [maemo-commits] r8255 - in projects/haf/trunk/maemo-theme-layout-3: . rc
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]