[gucharmap] Revert "charmap: Port main to vala"

[Christian Persch <chpe src gnome org>]

commit 921e97823f2b78af606e84aac8678ee9fe4c7fa9
Author: Christian Persch <chpe gnome org>
Date:   Sat May 12 17:05:53 2012 +0200

    Revert "charmap: Port main to vala"
    
    This reverts commit eb3505fb3672493e753f848c471ddfce8043eac1.

 gucharmap/Makefile.am          |   22 +---------------------
 gucharmap/config.vapi          |    7 -------
 gucharmap/gucharmap-internal.h |   27 ---------------------------
 gucharmap/gucharmap-window.c   |    8 +++-----
 gucharmap/gucharmap-window.h   |    6 +++---
 5 files changed, 7 insertions(+), 63 deletions(-)
---
diff --git a/gucharmap/Makefile.am b/gucharmap/Makefile.am
index 79ae331..4b5b117 100644
--- a/gucharmap/Makefile.am
+++ b/gucharmap/Makefile.am
@@ -111,7 +111,6 @@ nodist_libgucharmapinclude_HEADERS = \
 noinst_LTLIBRARIES = libgucharmapprivate.la
 
 libgucharmapprivate_la_SOURCES = \
-	gucharmap-internal.h \
 	gucharmap-mini-fontsel.c \
 	gucharmap-mini-fontsel.h \
 	gucharmap-print-operation.c \
@@ -151,21 +150,12 @@ else
 noinst_PROGRAMS = gucharmap
 endif
 
-gucharmap_DEPENDENCIES = \
-	libgucharmap GUCHARMAP_LIBRARY_SUFFIX_U@.la \
-	libgucharmapprivate.la
-	Gucharmap-$(GUCHARMAP_VAPI_VERSION).vapi \
-	Gucharmap-Private.vapi \
-	$(NULL)
-
 gucharmap_SOURCES = \
-	config.vapi \
-	charmap.vala \
+	main.c \
 	$(NULL)
 
 gucharmap_CPPFLAGS = \
 	-I$(top_srcdir) \
-	-DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \
 	-DLOCALEDIR=\"$(datadir)/locale\" \
 	$(AM_CPPFLAGS)
 
@@ -176,12 +166,6 @@ gucharmap_CFLAGS = \
 gucharmap_LDFLAGS = \
 	$(AM_LDFLAGS)
 
-gucharmap_VALAFLAGS = \
-	--pkg glib-2.0 \
-	--pkg gtk+-3.0 \
-	--vapidir . --pkg Gucharmap-$(GUCHARMAP_VAPI_VERSION) --pkg Gucharmap-Private \
-	$(AM_VALAFLAGS)
-
 gucharmap_LDADD = \
 	libgucharmap GUCHARMAP_LIBRARY_SUFFIX_U@.la	\
 	libgucharmapprivate.la \
@@ -256,8 +240,6 @@ INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
 INTROSPECTION_GIRS = Gucharmap-$(GUCHARMAP_GIR_VERSION).gir Gucharmap-Private.gir
 
 Gucharmap- GUCHARMAP_GIR_VERSION@.gir: libgucharmap GUCHARMAP_LIBRARY_SUFFIX_U@.la
-Gucharmap_ GUCHARMAP_GIR_VERSION_U@_gir_EXPORT_PACKAGES = gucharmap-$(GUCHARMAP_API_PC_VERSION)
-Gucharmap_ GUCHARMAP_GIR_VERSION_U@_gir_SCANNERFLAGS = --c-include "gucharmap/gucharmap.h"
 Gucharmap_ GUCHARMAP_GIR_VERSION_U@_gir_INCLUDES = Pango-1.0 Gdk-$(GTK_API_VERSION) Gtk-$(GTK_API_VERSION)
 Gucharmap_ GUCHARMAP_GIR_VERSION_U@_gir_CFLAGS = $(GTK_CFLAGS) -DGUCHARMAP_COMPILATION -I$(top_srcdir) -I$(top_builddir)
 Gucharmap_ GUCHARMAP_GIR_VERSION_U@_gir_LIBS = libgucharmap GUCHARMAP_LIBRARY_SUFFIX_U@.la
@@ -269,9 +251,7 @@ Gucharmap_Private_gir_CFLAGS = $(GTK_CFLAGS) -DGUCHARMAP_COMPILATION -I$(top_src
 Gucharmap_Private_gir_LIBS = libgucharmapprivate.la
 Gucharmap_Private_gir_NAMESPACE = GucharmapPrivate
 Gucharmap_Private_gir_VERSION = $(GUCHARMAP_GIR_VERSION)
-Gucharmap_Private_gir_EXPORT_PACKAGES =
 Gucharmap_Private_gir_SCANNERFLAGS = \
-	--c-include "gucharmap-internal.h" \
 	--identifier-prefix=Gucharmap \
 	--symbol-prefix=gucharmap \
 	--include-uninstalled ./Gucharmap-$(GUCHARMAP_GIR_VERSION).gir \
diff --git a/gucharmap/gucharmap-window.c b/gucharmap/gucharmap-window.c
index 900900c..88cf729 100644
--- a/gucharmap/gucharmap-window.c
+++ b/gucharmap/gucharmap-window.c
@@ -37,7 +37,7 @@
 static void gucharmap_window_class_init (GucharmapWindowClass *klass);
 static void gucharmap_window_init       (GucharmapWindow *window);
 
-G_DEFINE_TYPE (GucharmapWindow, gucharmap_window, GTK_TYPE_APPLICATION_WINDOW)
+G_DEFINE_TYPE (GucharmapWindow, gucharmap_window, GTK_TYPE_WINDOW)
 
 static void
 show_error_dialog (GtkWindow *parent,
@@ -994,11 +994,9 @@ gucharmap_window_class_init (GucharmapWindowClass *klass)
 /* Public API */
 
 GtkWidget *
-gucharmap_window_new (GApplication *application)
+gucharmap_window_new (void)
 {
-  return g_object_new (GUCHARMAP_TYPE_WINDOW,
-                       "application", application,
-                       NULL);
+  return GTK_WIDGET (g_object_new (gucharmap_window_get_type (), NULL));
 }
 
 void
diff --git a/gucharmap/gucharmap-window.h b/gucharmap/gucharmap-window.h
index fe1bd4e..e75f2eb 100644
--- a/gucharmap/gucharmap-window.h
+++ b/gucharmap/gucharmap-window.h
@@ -38,7 +38,7 @@ typedef struct _GucharmapWindowClass GucharmapWindowClass;
 
 struct _GucharmapWindow
 {
-  GtkApplicationWindow parent;
+  GtkWindow parent;
 
   GSettings *settings;
   GucharmapCharmap *charmap;
@@ -63,14 +63,14 @@ struct _GucharmapWindow
 
 struct _GucharmapWindowClass
 {
-  GtkApplicationWindowClass parent_class;
+  GtkWindowClass parent_class;
 };
 
 #define GUCHARMAP_ICON_NAME "accessories-character-map"
 
 GType       gucharmap_window_get_type  (void);
 
-GtkWidget * gucharmap_window_new       (GApplication *application);
+GtkWidget * gucharmap_window_new       (void);
 
 void        gucharmap_window_set_font  (GucharmapWindow *guw,
                                         const char *font);