gnome-terminal r2574 - in trunk: . src

[chpe svn gnome org]

Author: chpe
Date: Thu May 29 19:34:56 2008
New Revision: 2574
URL: http://svn.gnome.org/viewvc/gnome-terminal?rev=2574&view=rev

Log:
Add type builtins for TerminalProfile.


Added:
   trunk/src/terminal-type-builtins.c.template
   trunk/src/terminal-type-builtins.h.template
Modified:
   trunk/configure.in
   trunk/src/Makefile.am

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Thu May 29 19:34:56 2008
@@ -13,6 +13,7 @@
 
 AM_MAINTAINER_MODE
 
+PKG_PROG_PKG_CONFIG
 AC_PROG_CC
 AC_ISC_POSIX
 AC_HEADER_STDC
@@ -29,7 +30,7 @@
 GTK_REQUIRED=2.12.0
 GCONF_REQUIRED=2.14.0
 STARTUP_NOTIFICATION_REQUIRED=0.8
-VTE_REQUIRED=0.15.3
+VTE_REQUIRED=0.16.13
 LIBGNOME_REQUIRED=2.14.0
 
 ## here we get the flags we'll actually use
@@ -56,9 +57,6 @@
 
 AM_GCONF_SOURCE_2
 
-# Honor aclocal flags
-ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
-
 if $PKG_CONFIG 'xft >= 2.0.0 pangoxft >= 1.1.1'; then
    using_xft2=yes
    CPPFLAGS="`$PKG_CONFIG --cflags xft pangoxft` $CPPFLAGS"
@@ -67,6 +65,11 @@
    using_xft2=no
 fi
 
+GLIB_GENMARSHAL="$($PKG_CONFIG --variable=glib_genmarshal glib-2.0)"
+AC_SUBST([GLIB_GENMARSHAL])
+GLIB_MKENUMS="$($PKG_CONFIG --variable=glib_mkenums glib-2.0)"
+AC_SUBST([GLIB_MKENUMS])
+
 GNOME_DOC_INIT
 
 AC_CONFIG_FILES([

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Thu May 29 19:34:56 2008
@@ -41,6 +41,8 @@
 	terminal-screen-container.h		\
 	terminal-tabs-menu.c			\
 	terminal-tabs-menu.h			\
+	terminal-type-builtins.c		\
+	terminal-type-builtins.h		\
 	terminal-widget.h			\
 	terminal-widget-vte.c			\
 	terminal-window.c			\
@@ -49,6 +51,29 @@
 
 gnome_terminal_LDADD= $(EFENCE) @TERM_LIBS@ skey/libskey.la
 
+BUILT_SOURCES = \
+	terminal-type-builtins.c \
+	terminal-type-builtins.h \
+	$(NULL)
+	
+TYPES_H_FILES = \
+	terminal-profile.h \
+	$(NULL)
+
+terminal-type-builtins.h: stamp-terminal-type-builtins.h
+	@true
+
+stamp-terminal-type-builtins.h: terminal-type-builtins.h.template $(TYPES_H_FILES)
+	$(GLIB_MKENUMS) --template $< $(filter-out $<,$^) > xgen-ttbh \
+	&& (cmp -s xgen-ttbh terminal-type-builtins.h || cp xgen-ttbh terminal-type-builtins.h ) \
+	&& rm -f xgen-ttbh \
+	&& echo timestamp > $(@F)
+
+terminal-type-builtins.c: terminal-type-builtins.c.template $(TYPES_H_FILES)
+	$(GLIB_MKENUMS) --template $< $(filter-out $<,$^) > xgen-ttbc \
+	&& (cmp -s xgen-ttbc terminal-type-builtins.c || cp xgen-ttbc terminal-type-builtins.c ) \
+	&& rm -f xgen-ttbc
+
 gladedir   = $(pkgdatadir)/glade
 glade_DATA = gnome-terminal.glade2
 

Added: trunk/src/terminal-type-builtins.c.template
==============================================================================
--- (empty file)
+++ trunk/src/terminal-type-builtins.c.template	Thu May 29 19:34:56 2008
@@ -0,0 +1,40 @@
+/*** BEGIN file-header ***/
+#include "terminal-type-builtins.h"
+
+/*** END file-header ***/
+
+/*** BEGIN file-production ***/
+/* enumerations from "@filename@" */
+/*** END file-production ***/
+
+/*** BEGIN value-header ***/
+GType
+ enum_name@_get_type (void)
+{
+  static volatile gsize g_define_type_id__volatile = 0;
+ 
+  if (g_once_init_enter (&g_define_type_id__volatile)) {
+    static const G Type@Value values[] = {
+/*** END value-header ***/
+
+/*** BEGIN value-production ***/
+      { @VALUENAME@, "@VALUENAME@", "@valuenick@" },
+/*** END value-production ***/
+
+/*** BEGIN value-tail ***/
+      { 0, NULL, NULL }
+    };
+    GType g_define_type_id = \
+       g_ type@_register_static (/* g_intern_static_string */ ("@EnumName@"), values);
+      
+    g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
+  }
+    
+  return g_define_type_id__volatile;
+}
+
+/*** END value-tail ***/
+
+/*** BEGIN file-tail ***/
+
+/*** END file-tail ***/

Added: trunk/src/terminal-type-builtins.h.template
==============================================================================
--- (empty file)
+++ trunk/src/terminal-type-builtins.h.template	Thu May 29 19:34:56 2008
@@ -0,0 +1,25 @@
+/*** BEGIN file-header ***/
+#ifndef TERMINAL_TYPE_BUILTINS_H
+#define TERMINAL_TYPE_BUILTINS_H
+
+#include <glib-object.h>
+#include "terminal-profile.h"
+
+G_BEGIN_DECLS
+/*** END file-header ***/
+
+/*** BEGIN file-production ***/
+
+/* enumerations from "@filename@" */
+/*** END file-production ***/
+
+/*** BEGIN value-header ***/
+GType @enum_name _get_type (void);
+#define TERMINAL_TYPE_ ENUMSHORT@ (@enum_name _get_type ())
+/*** END value-header ***/
+
+/*** BEGIN file-tail ***/
+G_END_DECLS
+
+#endif /* !TERMINAL_TYPE_BUILTINS_H */
+/*** END file-tail ***/