adium 5353:28908d6bc414: Merged adium-1.5.5 into adium-1.6.
commits at adium.im
commits at adium.im
Fri Feb 22 00:22:36 UTC 2013
details: http://hg.adium.im/adium/rev/28908d6bc414
revision: 5353:28908d6bc414
branch: adium-1.6
author: Thijs Alkemade <me at thijsalkema.de>
date: Fri Feb 22 01:20:08 2013 +0100
Merged adium-1.5.5 into adium-1.6.
Subject: adium 5354:e0b463190385: Merged adium-1.5.5 into adium-1.6 again.
details: http://hg.adium.im/adium/rev/e0b463190385
revision: 5354:e0b463190385
branch: adium-1.6
author: Thijs Alkemade <me at thijsalkema.de>
date: Fri Feb 22 01:22:17 2013 +0100
Merged adium-1.5.5 into adium-1.6 again.
diffs (truncated from 374186 to 1000 lines):
diff -r 51943d9ac8ee -r e0b463190385 AdiumHelp/pgs/Miscellaneous-AVSkypeSupport.html
--- a/AdiumHelp/pgs/Miscellaneous-AVSkypeSupport.html Thu Feb 21 22:47:30 2013 +0100
+++ b/AdiumHelp/pgs/Miscellaneous-AVSkypeSupport.html Fri Feb 22 01:22:17 2013 +0100
@@ -38,7 +38,7 @@
<p><strong>What about the Skype API?</strong></p>
<p>Using the Skype API, as the Skype Plugin does, means that Skype must be running. We don't accept piggybacking on the official client as a substitute.</p>
<p><strong>What about SkypeKit?</strong></p>
- <p>The SkypeKit SDK is not licensed to be used in any open-source software, such as Adium and so needs to be rewritten. <a class="ext_link" href="http://adiumxtras.com/index.php?a=xtras&xtra_id=5011">SkypeKit</a> also needs a skypekit-client program to be running in the background, so it puts us in the same boat as using the Skype API.</p>
+ <p>The SkypeKit SDK is not licensed to be used in any open-source software, such as Adium and so needs to be rewritten. SkypeKit also needs a skypekit-client program to be running in the background, so it puts us in the same boat as using the Skype API.</p>
</div>
</div>
</div>
diff -r 51943d9ac8ee -r e0b463190385 ChangeLogs/Changes.txt
--- a/ChangeLogs/Changes.txt Thu Feb 21 22:47:30 2013 +0100
+++ b/ChangeLogs/Changes.txt Fri Feb 22 01:22:17 2013 +0100
@@ -10,6 +10,10 @@
Accessibility
* Fixed tabs not being spoken by VoiceOver. (#16088)
+Version 1.5.5 (X/X/X)
+ * Fixed "Add Link..." when the cursor is at the end of the line. (#16200)
+ * Updated Spanish translation. (#16291)
+
Chat window
* Fixed an issue that occurred when dragging a conversation window into an existing tabbed conversation window. (#16281)
* Made the Shift-Return keyboard shortcut add a newline the way Alt-Return does. (Detmud) (#16285)
diff -r 51943d9ac8ee -r e0b463190385 Frameworks/libffi.framework/Versions/3.0.11/libffi
Binary file Frameworks/libffi.framework/Versions/3.0.11/libffi has changed
diff -r 51943d9ac8ee -r e0b463190385 Frameworks/libgcrypt.framework/Versions/1.5.0/libgcrypt
Binary file Frameworks/libgcrypt.framework/Versions/1.5.0/libgcrypt has changed
diff -r 51943d9ac8ee -r e0b463190385 Frameworks/libglib.framework/Headers
--- a/Frameworks/libglib.framework/Headers Thu Feb 21 22:47:30 2013 +0100
+++ b/Frameworks/libglib.framework/Headers Fri Feb 22 01:22:17 2013 +0100
@@ -1,1 +1,1 @@
-Versions/2.32.4/Headers
\ No newline at end of file
+Versions/2.34.3/Headers
\ No newline at end of file
diff -r 51943d9ac8ee -r e0b463190385 Frameworks/libglib.framework/Resources
--- a/Frameworks/libglib.framework/Resources Thu Feb 21 22:47:30 2013 +0100
+++ b/Frameworks/libglib.framework/Resources Fri Feb 22 01:22:17 2013 +0100
@@ -1,1 +1,1 @@
-Versions/2.32.4/Resources
\ No newline at end of file
+Versions/2.34.3/Resources
\ No newline at end of file
diff -r 51943d9ac8ee -r e0b463190385 Frameworks/libglib.framework/Versions/2.32.4/Headers/gio/gaction.h
--- a/Frameworks/libglib.framework/Versions/2.32.4/Headers/gio/gaction.h Thu Feb 21 22:47:30 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,78 +0,0 @@
-/*
- * Copyright © 2010 Codethink Limited
- *
- * This program 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 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
- * 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.
- *
- * Authors: Ryan Lortie <desrt at desrt.ca>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_ACTION_H__
-#define __G_ACTION_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_ACTION (g_action_get_type ())
-#define G_ACTION(inst) (G_TYPE_CHECK_INSTANCE_CAST ((inst), \
- G_TYPE_ACTION, GAction))
-#define G_IS_ACTION(inst) (G_TYPE_CHECK_INSTANCE_TYPE ((inst), G_TYPE_ACTION))
-#define G_ACTION_GET_IFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), \
- G_TYPE_ACTION, GActionInterface))
-
-typedef struct _GActionInterface GActionInterface;
-
-struct _GActionInterface
-{
- GTypeInterface g_iface;
-
- /* virtual functions */
- const gchar * (* get_name) (GAction *action);
- const GVariantType * (* get_parameter_type) (GAction *action);
- const GVariantType * (* get_state_type) (GAction *action);
- GVariant * (* get_state_hint) (GAction *action);
-
- gboolean (* get_enabled) (GAction *action);
- GVariant * (* get_state) (GAction *action);
-
- void (* change_state) (GAction *action,
- GVariant *value);
- void (* activate) (GAction *action,
- GVariant *parameter);
-};
-
-GLIB_AVAILABLE_IN_2_30
-GType g_action_get_type (void) G_GNUC_CONST;
-
-const gchar * g_action_get_name (GAction *action);
-const GVariantType * g_action_get_parameter_type (GAction *action);
-const GVariantType * g_action_get_state_type (GAction *action);
-GVariant * g_action_get_state_hint (GAction *action);
-
-gboolean g_action_get_enabled (GAction *action);
-GVariant * g_action_get_state (GAction *action);
-
-void g_action_change_state (GAction *action,
- GVariant *value);
-void g_action_activate (GAction *action,
- GVariant *parameter);
-G_END_DECLS
-
-#endif /* __G_ACTION_H__ */
diff -r 51943d9ac8ee -r e0b463190385 Frameworks/libglib.framework/Versions/2.32.4/Headers/gio/gactiongroup.h
--- a/Frameworks/libglib.framework/Versions/2.32.4/Headers/gio/gactiongroup.h Thu Feb 21 22:47:30 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,149 +0,0 @@
-/*
- * Copyright © 2010 Codethink Limited
- *
- * This program 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 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
- * 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.
- *
- * Authors: Ryan Lortie <desrt at desrt.ca>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_ACTION_GROUP_H__
-#define __G_ACTION_GROUP_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-
-#define G_TYPE_ACTION_GROUP (g_action_group_get_type ())
-#define G_ACTION_GROUP(inst) (G_TYPE_CHECK_INSTANCE_CAST ((inst), \
- G_TYPE_ACTION_GROUP, GActionGroup))
-#define G_IS_ACTION_GROUP(inst) (G_TYPE_CHECK_INSTANCE_TYPE ((inst), \
- G_TYPE_ACTION_GROUP))
-#define G_ACTION_GROUP_GET_IFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), \
- G_TYPE_ACTION_GROUP, GActionGroupInterface))
-
-typedef struct _GActionGroupInterface GActionGroupInterface;
-
-struct _GActionGroupInterface
-{
- GTypeInterface g_iface;
-
- /* virtual functions */
- gboolean (* has_action) (GActionGroup *action_group,
- const gchar *action_name);
-
- gchar ** (* list_actions) (GActionGroup *action_group);
-
- gboolean (* get_action_enabled) (GActionGroup *action_group,
- const gchar *action_name);
-
- const GVariantType * (* get_action_parameter_type) (GActionGroup *action_group,
- const gchar *action_name);
-
- const GVariantType * (* get_action_state_type) (GActionGroup *action_group,
- const gchar *action_name);
-
- GVariant * (* get_action_state_hint) (GActionGroup *action_group,
- const gchar *action_name);
-
- GVariant * (* get_action_state) (GActionGroup *action_group,
- const gchar *action_name);
-
- void (* change_action_state) (GActionGroup *action_group,
- const gchar *action_name,
- GVariant *value);
-
- void (* activate_action) (GActionGroup *action_group,
- const gchar *action_name,
- GVariant *parameter);
-
- /* signals */
- void (* action_added) (GActionGroup *action_group,
- const gchar *action_name);
- void (* action_removed) (GActionGroup *action_group,
- const gchar *action_name);
- void (* action_enabled_changed) (GActionGroup *action_group,
- const gchar *action_name,
- gboolean enabled);
- void (* action_state_changed) (GActionGroup *action_group,
- const gchar *action_name,
- GVariant *state);
-
- /* more virtual functions */
- gboolean (* query_action) (GActionGroup *action_group,
- const gchar *action_name,
- gboolean *enabled,
- const GVariantType **parameter_type,
- const GVariantType **state_type,
- GVariant **state_hint,
- GVariant **state);
-};
-
-GType g_action_group_get_type (void) G_GNUC_CONST;
-
-gboolean g_action_group_has_action (GActionGroup *action_group,
- const gchar *action_name);
-gchar ** g_action_group_list_actions (GActionGroup *action_group);
-
-const GVariantType * g_action_group_get_action_parameter_type (GActionGroup *action_group,
- const gchar *action_name);
-const GVariantType * g_action_group_get_action_state_type (GActionGroup *action_group,
- const gchar *action_name);
-GVariant * g_action_group_get_action_state_hint (GActionGroup *action_group,
- const gchar *action_name);
-
-gboolean g_action_group_get_action_enabled (GActionGroup *action_group,
- const gchar *action_name);
-
-GVariant * g_action_group_get_action_state (GActionGroup *action_group,
- const gchar *action_name);
-void g_action_group_change_action_state (GActionGroup *action_group,
- const gchar *action_name,
- GVariant *value);
-
-void g_action_group_activate_action (GActionGroup *action_group,
- const gchar *action_name,
- GVariant *parameter);
-
-/* signals */
-void g_action_group_action_added (GActionGroup *action_group,
- const gchar *action_name);
-void g_action_group_action_removed (GActionGroup *action_group,
- const gchar *action_name);
-void g_action_group_action_enabled_changed (GActionGroup *action_group,
- const gchar *action_name,
- gboolean enabled);
-
-void g_action_group_action_state_changed (GActionGroup *action_group,
- const gchar *action_name,
- GVariant *state);
-
-GLIB_AVAILABLE_IN_2_32
-gboolean g_action_group_query_action (GActionGroup *action_group,
- const gchar *action_name,
- gboolean *enabled,
- const GVariantType **parameter_type,
- const GVariantType **state_type,
- GVariant **state_hint,
- GVariant **state);
-
-G_END_DECLS
-
-#endif /* __G_ACTION_GROUP_H__ */
diff -r 51943d9ac8ee -r e0b463190385 Frameworks/libglib.framework/Versions/2.32.4/Headers/gio/gactiongroupexporter.h
--- a/Frameworks/libglib.framework/Versions/2.32.4/Headers/gio/gactiongroupexporter.h Thu Feb 21 22:47:30 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-/*
- * Copyright © 2010 Codethink Limited
- * Copyright © 2011 Canonical Limited
- *
- * This program 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 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
- * 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.
- *
- * Authors: Ryan Lortie <desrt at desrt.ca>
- */
-
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_ACTION_GROUP_EXPORTER_H__
-#define __G_ACTION_GROUP_EXPORTER_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-GLIB_AVAILABLE_IN_2_32
-guint g_dbus_connection_export_action_group (GDBusConnection *connection,
- const gchar *object_path,
- GActionGroup *action_group,
- GError **error);
-
-GLIB_AVAILABLE_IN_2_32
-void g_dbus_connection_unexport_action_group (GDBusConnection *connection,
- guint export_id);
-
-G_END_DECLS
-
-#endif /* __G_ACTION_GROUP_EXPORTER_H__ */
diff -r 51943d9ac8ee -r e0b463190385 Frameworks/libglib.framework/Versions/2.32.4/Headers/gio/gactionmap.h
--- a/Frameworks/libglib.framework/Versions/2.32.4/Headers/gio/gactionmap.h Thu Feb 21 22:47:30 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,93 +0,0 @@
-/*
- * Copyright © 2010 Codethink Limited
- *
- * This program 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 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
- * 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.
- *
- * Authors: Ryan Lortie <desrt at desrt.ca>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_ACTION_MAP_H__
-#define __G_ACTION_MAP_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-
-#define G_TYPE_ACTION_MAP (g_action_map_get_type ())
-#define G_ACTION_MAP(inst) (G_TYPE_CHECK_INSTANCE_CAST ((inst), \
- G_TYPE_ACTION_MAP, GActionMap))
-#define G_IS_ACTION_MAP(inst) (G_TYPE_CHECK_INSTANCE_TYPE ((inst), \
- G_TYPE_ACTION_MAP))
-#define G_ACTION_MAP_GET_IFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), \
- G_TYPE_ACTION_MAP, GActionMapInterface))
-
-typedef struct _GActionMapInterface GActionMapInterface;
-typedef struct _GActionEntry GActionEntry;
-
-struct _GActionMapInterface
-{
- GTypeInterface g_iface;
-
- GAction * (* lookup_action) (GActionMap *action_map,
- const gchar *action_name);
- void (* add_action) (GActionMap *action_map,
- GAction *action);
- void (* remove_action) (GActionMap *action_map,
- const gchar *action_name);
-};
-
-struct _GActionEntry
-{
- const gchar *name;
-
- void (* activate) (GSimpleAction *action,
- GVariant *parameter,
- gpointer user_data);
-
- const gchar *parameter_type;
-
- const gchar *state;
-
- void (* change_state) (GSimpleAction *action,
- GVariant *value,
- gpointer user_data);
-
- /*< private >*/
- gsize padding[3];
-};
-
-GLIB_AVAILABLE_IN_2_32
-GType g_action_map_get_type (void) G_GNUC_CONST;
-
-GAction * g_action_map_lookup_action (GActionMap *action_map,
- const gchar *action_name);
-void g_action_map_add_action (GActionMap *action_map,
- GAction *action);
-void g_action_map_remove_action (GActionMap *action_map,
- const gchar *action_name);
-void g_action_map_add_action_entries (GActionMap *action_map,
- const GActionEntry *entries,
- gint n_entries,
- gpointer user_data);
-
-G_END_DECLS
-
-#endif /* __G_ACTION_MAP_H__ */
diff -r 51943d9ac8ee -r e0b463190385 Frameworks/libglib.framework/Versions/2.32.4/Headers/gio/gappinfo.h
--- a/Frameworks/libglib.framework/Versions/2.32.4/Headers/gio/gappinfo.h Thu Feb 21 22:47:30 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,258 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * 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.
- *
- * 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
- * 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.
- *
- * Author: Alexander Larsson <alexl at redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_APP_INFO_H__
-#define __G_APP_INFO_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_APP_INFO (g_app_info_get_type ())
-#define G_APP_INFO(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), G_TYPE_APP_INFO, GAppInfo))
-#define G_IS_APP_INFO(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G_TYPE_APP_INFO))
-#define G_APP_INFO_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), G_TYPE_APP_INFO, GAppInfoIface))
-
-#define G_TYPE_APP_LAUNCH_CONTEXT (g_app_launch_context_get_type ())
-#define G_APP_LAUNCH_CONTEXT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_APP_LAUNCH_CONTEXT, GAppLaunchContext))
-#define G_APP_LAUNCH_CONTEXT_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_APP_LAUNCH_CONTEXT, GAppLaunchContextClass))
-#define G_IS_APP_LAUNCH_CONTEXT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_APP_LAUNCH_CONTEXT))
-#define G_IS_APP_LAUNCH_CONTEXT_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_APP_LAUNCH_CONTEXT))
-#define G_APP_LAUNCH_CONTEXT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_APP_LAUNCH_CONTEXT, GAppLaunchContextClass))
-
-typedef struct _GAppLaunchContextClass GAppLaunchContextClass;
-typedef struct _GAppLaunchContextPrivate GAppLaunchContextPrivate;
-
-/**
- * GAppInfo:
- *
- * Information about an installed application and methods to launch
- * it (with file arguments).
- */
-
-/**
- * GAppInfoIface:
- * @g_iface: The parent interface.
- * @dup: Copies a #GAppInfo.
- * @equal: Checks two #GAppInfo<!-- -->s for equality.
- * @get_id: Gets a string identifier for a #GAppInfo.
- * @get_name: Gets the name of the application for a #GAppInfo.
- * @get_description: Gets a short description for the application described by the #GAppInfo.
- * @get_executable: Gets the executable name for the #GAppInfo.
- * @get_icon: Gets the #GIcon for the #GAppInfo.
- * @launch: Launches an application specified by the #GAppInfo.
- * @supports_uris: Indicates whether the application specified supports launching URIs.
- * @supports_files: Indicates whether the application specified accepts filename arguments.
- * @launch_uris: Launches an application with a list of URIs.
- * @should_show: Returns whether an application should be shown (e.g. when getting a list of installed applications).
- * <ulink url="http://standards.freedesktop.org/startup-notification-spec/startup-notification-latest.txt">
- * <citetitle>FreeDesktop.Org Startup Notification Specification</citetitle></ulink>.
- * @set_as_default_for_type: Sets an application as default for a given content type.
- * @set_as_default_for_extension: Sets an application as default for a given file extension.
- * @add_supports_type: Adds to the #GAppInfo information about supported file types.
- * @can_remove_supports_type: Checks for support for removing supported file types from a #GAppInfo.
- * @remove_supports_type: Removes a supported application type from a #GAppInfo.
- * @can_delete: Checks if a #GAppInfo can be deleted. Since 2.20
- * @do_delete: Deletes a #GAppInfo. Since 2.20
- * @get_commandline: Gets the commandline for the #GAppInfo. Since 2.20
- * @get_display_name: Gets the display name for the #GAppInfo. Since 2.24
- * @set_as_last_used_for_type: Sets the application as the last used. See g_app_info_set_as_last_used_for_type().
- *
- * Application Information interface, for operating system portability.
- */
-typedef struct _GAppInfoIface GAppInfoIface;
-
-struct _GAppInfoIface
-{
- GTypeInterface g_iface;
-
- /* Virtual Table */
-
- GAppInfo * (* dup) (GAppInfo *appinfo);
- gboolean (* equal) (GAppInfo *appinfo1,
- GAppInfo *appinfo2);
- const char * (* get_id) (GAppInfo *appinfo);
- const char * (* get_name) (GAppInfo *appinfo);
- const char * (* get_description) (GAppInfo *appinfo);
- const char * (* get_executable) (GAppInfo *appinfo);
- GIcon * (* get_icon) (GAppInfo *appinfo);
- gboolean (* launch) (GAppInfo *appinfo,
- GList *files,
- GAppLaunchContext *launch_context,
- GError **error);
- gboolean (* supports_uris) (GAppInfo *appinfo);
- gboolean (* supports_files) (GAppInfo *appinfo);
- gboolean (* launch_uris) (GAppInfo *appinfo,
- GList *uris,
- GAppLaunchContext *launch_context,
- GError **error);
- gboolean (* should_show) (GAppInfo *appinfo);
-
- /* For changing associations */
- gboolean (* set_as_default_for_type) (GAppInfo *appinfo,
- const char *content_type,
- GError **error);
- gboolean (* set_as_default_for_extension) (GAppInfo *appinfo,
- const char *extension,
- GError **error);
- gboolean (* add_supports_type) (GAppInfo *appinfo,
- const char *content_type,
- GError **error);
- gboolean (* can_remove_supports_type) (GAppInfo *appinfo);
- gboolean (* remove_supports_type) (GAppInfo *appinfo,
- const char *content_type,
- GError **error);
- gboolean (* can_delete) (GAppInfo *appinfo);
- gboolean (* do_delete) (GAppInfo *appinfo);
- const char * (* get_commandline) (GAppInfo *appinfo);
- const char * (* get_display_name) (GAppInfo *appinfo);
- gboolean (* set_as_last_used_for_type) (GAppInfo *appinfo,
- const char *content_type,
- GError **error);
-};
-
-GType g_app_info_get_type (void) G_GNUC_CONST;
-GAppInfo * g_app_info_create_from_commandline (const char *commandline,
- const char *application_name,
- GAppInfoCreateFlags flags,
- GError **error);
-GAppInfo * g_app_info_dup (GAppInfo *appinfo);
-gboolean g_app_info_equal (GAppInfo *appinfo1,
- GAppInfo *appinfo2);
-const char *g_app_info_get_id (GAppInfo *appinfo);
-const char *g_app_info_get_name (GAppInfo *appinfo);
-const char *g_app_info_get_display_name (GAppInfo *appinfo);
-const char *g_app_info_get_description (GAppInfo *appinfo);
-const char *g_app_info_get_executable (GAppInfo *appinfo);
-const char *g_app_info_get_commandline (GAppInfo *appinfo);
-GIcon * g_app_info_get_icon (GAppInfo *appinfo);
-gboolean g_app_info_launch (GAppInfo *appinfo,
- GList *files,
- GAppLaunchContext *launch_context,
- GError **error);
-gboolean g_app_info_supports_uris (GAppInfo *appinfo);
-gboolean g_app_info_supports_files (GAppInfo *appinfo);
-gboolean g_app_info_launch_uris (GAppInfo *appinfo,
- GList *uris,
- GAppLaunchContext *launch_context,
- GError **error);
-gboolean g_app_info_should_show (GAppInfo *appinfo);
-
-gboolean g_app_info_set_as_default_for_type (GAppInfo *appinfo,
- const char *content_type,
- GError **error);
-gboolean g_app_info_set_as_default_for_extension (GAppInfo *appinfo,
- const char *extension,
- GError **error);
-gboolean g_app_info_add_supports_type (GAppInfo *appinfo,
- const char *content_type,
- GError **error);
-gboolean g_app_info_can_remove_supports_type (GAppInfo *appinfo);
-gboolean g_app_info_remove_supports_type (GAppInfo *appinfo,
- const char *content_type,
- GError **error);
-gboolean g_app_info_can_delete (GAppInfo *appinfo);
-gboolean g_app_info_delete (GAppInfo *appinfo);
-
-gboolean g_app_info_set_as_last_used_for_type (GAppInfo *appinfo,
- const char *content_type,
- GError **error);
-
-GList * g_app_info_get_all (void);
-GList * g_app_info_get_all_for_type (const char *content_type);
-GList * g_app_info_get_recommended_for_type (const gchar *content_type);
-GList * g_app_info_get_fallback_for_type (const gchar *content_type);
-
-void g_app_info_reset_type_associations (const char *content_type);
-GAppInfo *g_app_info_get_default_for_type (const char *content_type,
- gboolean must_support_uris);
-GAppInfo *g_app_info_get_default_for_uri_scheme (const char *uri_scheme);
-
-gboolean g_app_info_launch_default_for_uri (const char *uri,
- GAppLaunchContext *launch_context,
- GError **error);
-
-/**
- * GAppLaunchContext:
- *
- * Integrating the launch with the launching application. This is used to
- * handle for instance startup notification and launching the new application
- * on the same screen as the launching window.
- */
-struct _GAppLaunchContext
-{
- GObject parent_instance;
-
- /*< private >*/
- GAppLaunchContextPrivate *priv;
-};
-
-struct _GAppLaunchContextClass
-{
- GObjectClass parent_class;
-
- char * (* get_display) (GAppLaunchContext *context,
- GAppInfo *info,
- GList *files);
- char * (* get_startup_notify_id) (GAppLaunchContext *context,
- GAppInfo *info,
- GList *files);
- void (* launch_failed) (GAppLaunchContext *context,
- const char *startup_notify_id);
-
- /* Padding for future expansion */
- void (*_g_reserved1) (void);
- void (*_g_reserved2) (void);
- void (*_g_reserved3) (void);
- void (*_g_reserved4) (void);
- void (*_g_reserved5) (void);
-};
-
-GType g_app_launch_context_get_type (void) G_GNUC_CONST;
-GAppLaunchContext *g_app_launch_context_new (void);
-
-GLIB_AVAILABLE_IN_2_32
-void g_app_launch_context_setenv (GAppLaunchContext *context,
- const char *variable,
- const char *value);
-GLIB_AVAILABLE_IN_2_32
-void g_app_launch_context_unsetenv (GAppLaunchContext *context,
- const char *variable);
-GLIB_AVAILABLE_IN_2_32
-char ** g_app_launch_context_get_environment (GAppLaunchContext *context);
-
-char * g_app_launch_context_get_display (GAppLaunchContext *context,
- GAppInfo *info,
- GList *files);
-char * g_app_launch_context_get_startup_notify_id (GAppLaunchContext *context,
- GAppInfo *info,
- GList *files);
-void g_app_launch_context_launch_failed (GAppLaunchContext *context,
- const char * startup_notify_id);
-
-G_END_DECLS
-
-#endif /* __G_APP_INFO_H__ */
diff -r 51943d9ac8ee -r e0b463190385 Frameworks/libglib.framework/Versions/2.32.4/Headers/gio/gapplication.h
--- a/Frameworks/libglib.framework/Versions/2.32.4/Headers/gio/gapplication.h Thu Feb 21 22:47:30 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,150 +0,0 @@
-/*
- * Copyright © 2010 Codethink Limited
- *
- * This program 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 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
- * 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.
- *
- * Authors: Ryan Lortie <desrt at desrt.ca>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_APPLICATION_H__
-#define __G_APPLICATION_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_APPLICATION (g_application_get_type ())
-#define G_APPLICATION(inst) (G_TYPE_CHECK_INSTANCE_CAST ((inst), \
- G_TYPE_APPLICATION, GApplication))
-#define G_APPLICATION_CLASS(class) (G_TYPE_CHECK_CLASS_CAST ((class), \
- G_TYPE_APPLICATION, GApplicationClass))
-#define G_IS_APPLICATION(inst) (G_TYPE_CHECK_INSTANCE_TYPE ((inst), G_TYPE_APPLICATION))
-#define G_IS_APPLICATION_CLASS(class) (G_TYPE_CHECK_CLASS_TYPE ((class), G_TYPE_APPLICATION))
-#define G_APPLICATION_GET_CLASS(inst) (G_TYPE_INSTANCE_GET_CLASS ((inst), \
- G_TYPE_APPLICATION, GApplicationClass))
-
-typedef struct _GApplicationPrivate GApplicationPrivate;
-typedef struct _GApplicationClass GApplicationClass;
-
-/**
- * GApplication:
- *
- * Since: 2.28
- */
-struct _GApplication
-{
- /*< private >*/
- GObject parent_instance;
-
- GApplicationPrivate *priv;
-};
-
-struct _GApplicationClass
-{
- /*< private >*/
- GObjectClass parent_class;
-
- /*< public >*/
- /* signals */
- void (* startup) (GApplication *application);
-
- void (* activate) (GApplication *application);
-
- void (* open) (GApplication *application,
- GFile **files,
- gint n_files,
- const gchar *hint);
-
- int (* command_line) (GApplication *application,
- GApplicationCommandLine *command_line);
-
- /* vfuncs */
- gboolean (* local_command_line) (GApplication *application,
- gchar ***arguments,
- int *exit_status);
-
- void (* before_emit) (GApplication *application,
- GVariant *platform_data);
- void (* after_emit) (GApplication *application,
- GVariant *platform_data);
- void (* add_platform_data) (GApplication *application,
- GVariantBuilder *builder);
- void (* quit_mainloop) (GApplication *application);
- void (* run_mainloop) (GApplication *application);
- void (* shutdown) (GApplication *application);
-
- /*< private >*/
- gpointer padding[11];
-};
-
-GType g_application_get_type (void) G_GNUC_CONST;
-
-gboolean g_application_id_is_valid (const gchar *application_id);
-
-GApplication * g_application_new (const gchar *application_id,
- GApplicationFlags flags);
-
-const gchar * g_application_get_application_id (GApplication *application);
-void g_application_set_application_id (GApplication *application,
- const gchar *application_id);
-
-guint g_application_get_inactivity_timeout (GApplication *application);
-void g_application_set_inactivity_timeout (GApplication *application,
- guint inactivity_timeout);
-
-GApplicationFlags g_application_get_flags (GApplication *application);
-void g_application_set_flags (GApplication *application,
- GApplicationFlags flags);
-
-GLIB_DEPRECATED
-void g_application_set_action_group (GApplication *application,
- GActionGroup *action_group);
-
-gboolean g_application_get_is_registered (GApplication *application);
-gboolean g_application_get_is_remote (GApplication *application);
-
-gboolean g_application_register (GApplication *application,
- GCancellable *cancellable,
- GError **error);
-
-void g_application_hold (GApplication *application);
-void g_application_release (GApplication *application);
-
-void g_application_activate (GApplication *application);
-
-void g_application_open (GApplication *application,
- GFile **files,
- gint n_files,
- const gchar *hint);
-
-int g_application_run (GApplication *application,
- int argc,
- char **argv);
-
-void g_application_quit (GApplication *application);
-
-GLIB_AVAILABLE_IN_2_32
-GApplication * g_application_get_default (void);
-GLIB_AVAILABLE_IN_2_32
-void g_application_set_default (GApplication *application);
-
-G_END_DECLS
-
-#endif /* __G_APPLICATION_H__ */
diff -r 51943d9ac8ee -r e0b463190385 Frameworks/libglib.framework/Versions/2.32.4/Headers/gio/gapplicationcommandline.h
--- a/Frameworks/libglib.framework/Versions/2.32.4/Headers/gio/gapplicationcommandline.h Thu Feb 21 22:47:30 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,102 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright © 2010 Codethink Limited
- *
- * This program 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 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
- * 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.
- *
- * Authors: Ryan Lortie <desrt at desrt.ca>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_APPLICATION_COMMAND_LINE_H__
-#define __G_APPLICATION_COMMAND_LINE_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_APPLICATION_COMMAND_LINE (g_application_command_line_get_type ())
-#define G_APPLICATION_COMMAND_LINE(inst) (G_TYPE_CHECK_INSTANCE_CAST ((inst), \
- G_TYPE_APPLICATION_COMMAND_LINE, \
- GApplicationCommandLine))
-#define G_APPLICATION_COMMAND_LINE_CLASS(class) (G_TYPE_CHECK_CLASS_CAST ((class), \
- G_TYPE_APPLICATION_COMMAND_LINE, \
- GApplicationCommandLineClass))
-#define G_IS_APPLICATION_COMMAND_LINE(inst) (G_TYPE_CHECK_INSTANCE_TYPE ((inst), \
- G_TYPE_APPLICATION_COMMAND_LINE))
-#define G_IS_APPLICATION_COMMAND_LINE_CLASS(class) (G_TYPE_CHECK_CLASS_TYPE ((class), \
- G_TYPE_APPLICATION_COMMAND_LINE))
-#define G_APPLICATION_COMMAND_LINE_GET_CLASS(inst) (G_TYPE_INSTANCE_GET_CLASS ((inst), \
- G_TYPE_APPLICATION_COMMAND_LINE, \
- GApplicationCommandLineClass))
-
-typedef struct _GApplicationCommandLinePrivate GApplicationCommandLinePrivate;
-typedef struct _GApplicationCommandLineClass GApplicationCommandLineClass;
-
-struct _GApplicationCommandLine
-{
- /*< private >*/
- GObject parent_instance;
-
- GApplicationCommandLinePrivate *priv;
-};
-
-struct _GApplicationCommandLineClass
-{
- /*< private >*/
- GObjectClass parent_class;
-
- void (* print_literal) (GApplicationCommandLine *cmdline,
- const gchar *message);
- void (* printerr_literal) (GApplicationCommandLine *cmdline,
- const gchar *message);
-
- gpointer padding[12];
-};
-
-GType g_application_command_line_get_type (void) G_GNUC_CONST;
-
-gchar ** g_application_command_line_get_arguments (GApplicationCommandLine *cmdline,
- int *argc);
-
-const gchar * const * g_application_command_line_get_environ (GApplicationCommandLine *cmdline);
-
-const gchar * g_application_command_line_getenv (GApplicationCommandLine *cmdline,
- const gchar *name);
-
-const gchar * g_application_command_line_get_cwd (GApplicationCommandLine *cmdline);
-
-gboolean g_application_command_line_get_is_remote (GApplicationCommandLine *cmdline);
-
-void g_application_command_line_print (GApplicationCommandLine *cmdline,
- const gchar *format,
- ..) G_GNUC_PRINTF(2, 3);
-void g_application_command_line_printerr (GApplicationCommandLine *cmdline,
- const gchar *format,
- ..) G_GNUC_PRINTF(2, 3);
-
-int g_application_command_line_get_exit_status (GApplicationCommandLine *cmdline);
-void g_application_command_line_set_exit_status (GApplicationCommandLine *cmdline,
- int exit_status);
-
-GVariant * g_application_command_line_get_platform_data (GApplicationCommandLine *cmdline);
-
-G_END_DECLS
-
-#endif /* __G_APPLICATION_COMMAND_LINE_H__ */
diff -r 51943d9ac8ee -r e0b463190385 Frameworks/libglib.framework/Versions/2.32.4/Headers/gio/gasyncinitable.h
--- a/Frameworks/libglib.framework/Versions/2.32.4/Headers/gio/gasyncinitable.h Thu Feb 21 22:47:30 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,119 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2009 Red Hat, Inc.
- *
- * 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.
- *
- * 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
- * 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.
- *
- * Author: Alexander Larsson <alexl at redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_ASYNC_INITABLE_H__
-#define __G_ASYNC_INITABLE_H__
-
-#include <gio/giotypes.h>
-#include <gio/ginitable.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_ASYNC_INITABLE (g_async_initable_get_type ())
-#define G_ASYNC_INITABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), G_TYPE_ASYNC_INITABLE, GAsyncInitable))
-#define G_IS_ASYNC_INITABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G_TYPE_ASYNC_INITABLE))
-#define G_ASYNC_INITABLE_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), G_TYPE_ASYNC_INITABLE, GAsyncInitableIface))
-#define G_TYPE_IS_ASYNC_INITABLE(type) (g_type_is_a ((type), G_TYPE_ASYNC_INITABLE))
-
-/**
- * GAsyncInitable:
- *
- * Interface for asynchronously initializable objects.
- *
More information about the commits
mailing list