GtkIconTheme: fix regression from 0db32f0632ef4675bfcfc9ec201f7af157a48ab0

[~andy/gtk] / gtk / gtkapplication.h

diff --git a/gtk/gtkapplication.h b/gtk/gtkapplication.h
index b9a9ad789868fe52e3f16771dc104d5e0c1a577f..7a6f8c2d20dc81ade2a7fd15914537e127667ca2 100644 (file)
--- a/gtk/gtkapplication.h
+++ b/gtk/gtkapplication.h
@@ -12,20 +12,18 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Ryan Lortie <desrt@desrt.ca>
  */
 
+#ifndef __GTK_APPLICATION_H__
+#define __GTK_APPLICATION_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_APPLICATION_H__
-#define __GTK_APPLICATION_H__
-
 #include <gtk/gtkwidget.h>
 #include <gio/gio.h>
 
@@ -59,10 +57,8 @@ struct _GtkApplicationClass
   void (*window_removed) (GtkApplication *application,
                           GtkWindow      *window);
 
-  void (*quit)           (GtkApplication *application);
-
   /*< private >*/
-  gpointer padding[11];
+  gpointer padding[12];
 };
 
 GType            gtk_application_get_type      (void) G_GNUC_CONST;
@@ -77,18 +73,24 @@ void             gtk_application_remove_window (GtkApplication    *application,
                                                 GtkWindow         *window);
 GList *          gtk_application_get_windows   (GtkApplication    *application);
 
+GDK_AVAILABLE_IN_3_4
 GMenuModel *     gtk_application_get_app_menu  (GtkApplication    *application);
+GDK_AVAILABLE_IN_3_4
 void             gtk_application_set_app_menu  (GtkApplication    *application,
                                                 GMenuModel        *app_menu);
 
+GDK_AVAILABLE_IN_3_4
 GMenuModel *     gtk_application_get_menubar   (GtkApplication    *application);
+GDK_AVAILABLE_IN_3_4
 void             gtk_application_set_menubar   (GtkApplication    *application,
                                                 GMenuModel        *menubar);
 
+GDK_AVAILABLE_IN_3_4
 void             gtk_application_add_accelerator    (GtkApplication  *application,
                                                      const gchar     *accelerator,
                                                      const gchar     *action_name,
                                                      GVariant        *parameter);
+GDK_AVAILABLE_IN_3_4
 void             gtk_application_remove_accelerator (GtkApplication *application,
                                                      const gchar    *action_name,
                                                      GVariant       *parameter);
@@ -101,24 +103,24 @@ typedef enum
   GTK_APPLICATION_INHIBIT_IDLE    = (1 << 3)
 } GtkApplicationInhibitFlags;
 
+GDK_AVAILABLE_IN_3_4
 guint            gtk_application_inhibit            (GtkApplication             *application,
                                                      GtkWindow                  *window,
                                                      GtkApplicationInhibitFlags  flags,
                                                      const gchar                *reason);
+GDK_AVAILABLE_IN_3_4
 void             gtk_application_uninhibit          (GtkApplication             *application,
                                                      guint                       cookie);
+GDK_AVAILABLE_IN_3_4
 gboolean         gtk_application_is_inhibited       (GtkApplication             *application,
                                                      GtkApplicationInhibitFlags  flags);
 
-typedef enum {
-  GTK_APPLICATION_LOGOUT,
-  GTK_APPLICATION_REBOOT,
-  GTK_APPLICATION_SHUTDOWN
-} GtkApplicationEndSessionStyle;
+GDK_AVAILABLE_IN_3_6
+GtkWindow *      gtk_application_get_window_by_id   (GtkApplication             *application,
+                                                     guint                       id);
 
-gboolean         gtk_application_end_session        (GtkApplication                *application,
-                                                     GtkApplicationEndSessionStyle  style,
-                                                     gboolean                       request_confirmation);
+GDK_AVAILABLE_IN_3_6
+GtkWindow *      gtk_application_get_active_window  (GtkApplication             *application);
 
 G_END_DECLS