GtkApplication rewrite

1 files changed, 15 insertions, 49 deletions

diff --git a/gtk/gtkapplication.h b/gtk/gtkapplication.h
index a6b2e8bfc6..a4ff6c5d0a 100644
--- a/gtk/gtkapplication.h
+++ b/gtk/gtkapplication.h
@@ -1,15 +1,14 @@
-/* GTK - The GIMP Toolkit
- *
- * Copyright (C) 2010 Red Hat, Inc.
+/*
+ * Copyright © 2010 Codethink Limited
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2 of the licence, or (at your option) any later version.
  *
  * This library 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
@@ -17,14 +16,7 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  *
- * Author: Colin Walters <walters@verbum.org>
- */
-
-/*
- * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
+ * Author: Ryan Lortie <desrt@desrt.ca>
  */
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
@@ -34,10 +26,9 @@
 #ifndef __GTK_APPLICATION_H__
 #define __GTK_APPLICATION_H__
 
-#include <gio/gio.h>
-#include <gtk/gtkaction.h>
 #include <gtk/gtkactiongroup.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtkwidget.h>
+#include <gio/gio.h>
 
 G_BEGIN_DECLS
 
@@ -57,7 +48,6 @@ struct _GtkApplication
   GApplication parent;
 
   /*< private >*/
-
   GtkApplicationPrivate *priv;
 };
 
@@ -66,40 +56,16 @@ struct _GtkApplicationClass
   GApplicationClass parent_class;
 
   /*< vfuncs >*/
-  GtkWindow *(* create_window) (GtkApplication *app);
-  void       (* activated)     (GtkApplication *app,
-                                GVariant       *args);
-  void       (* action)        (GtkApplication *app,
-                                const gchar    *action_name);
-  gboolean   (* quit)          (GtkApplication *app);
-			       
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-  void (*_gtk_reserved5) (void);
-  void (*_gtk_reserved6) (void);
-  void (*_gtk_reserved7) (void);
-  void (*_gtk_reserved8) (void);
-  void (*_gtk_reserved9) (void);
-  void (*_gtk_reserved10) (void);
+  GtkWindow *(* create_window) (GtkApplication *application);
+
+  /*< private >*/
+  gpointer padding[12];
 };
 
-GType                   gtk_application_get_type         (void) G_GNUC_CONST;
-GtkApplication*         gtk_application_new              (const gchar      *appid,
-                                                          gint             *argc,
-                                                          gchar          ***argv);
-void                    gtk_application_set_action_group (GtkApplication   *app,
-                                                          GtkActionGroup   *group);
-GtkWindow *             gtk_application_create_window    (GtkApplication   *app);
-GtkWindow *             gtk_application_get_window       (GtkApplication   *app);
-G_CONST_RETURN GSList * gtk_application_get_windows      (GtkApplication   *app);
-void                    gtk_application_add_window       (GtkApplication   *app,
-                                                          GtkWindow        *window);
-void                    gtk_application_run              (GtkApplication   *app);
-void                    gtk_application_quit             (GtkApplication   *app);
+GType                   gtk_application_get_type                        (void) G_GNUC_CONST;
+
+GtkApplication*         gtk_application_new                             (const gchar       *application_id,
+                                                                         GApplicationFlags  flags);
 
 G_END_DECLS