Commit e4fd0f31 authored by Mike Wey's avatar Mike Wey
Browse files

Update GLib to version 2.64

parent c9073a25
......@@ -97,9 +97,9 @@ Library | Version
--- | ---
Gtk+ | 3.24
Gdk | 3.24
Glib | 2.60
GObject | 2.60
Gio | 2.60
Glib | 2.64
GObject | 2.64
Gio | 2.64
Pango | 1.43
Atk | 2.32
Gdk-pixbuf | 2.38
......
......@@ -239,14 +239,14 @@ public template ActionGroupT(TStruct)
*/
public VariantType getActionParameterType(string actionName)
{
auto p = g_action_group_get_action_parameter_type(getActionGroupStruct(), Str.toStringz(actionName));
auto __p = g_action_group_get_action_parameter_type(getActionGroupStruct(), Str.toStringz(actionName));
if(p is null)
if(__p is null)
{
return null;
}
return new VariantType(cast(GVariantType*) p);
return new VariantType(cast(GVariantType*) __p);
}
/**
......@@ -268,14 +268,14 @@ public template ActionGroupT(TStruct)
*/
public Variant getActionState(string actionName)
{
auto p = g_action_group_get_action_state(getActionGroupStruct(), Str.toStringz(actionName));
auto __p = g_action_group_get_action_state(getActionGroupStruct(), Str.toStringz(actionName));
if(p is null)
if(__p is null)
{
return null;
}
return new Variant(cast(GVariant*) p, true);
return new Variant(cast(GVariant*) __p, true);
}
/**
......@@ -307,14 +307,14 @@ public template ActionGroupT(TStruct)
*/
public Variant getActionStateHint(string actionName)
{
auto p = g_action_group_get_action_state_hint(getActionGroupStruct(), Str.toStringz(actionName));
auto __p = g_action_group_get_action_state_hint(getActionGroupStruct(), Str.toStringz(actionName));
if(p is null)
if(__p is null)
{
return null;
}
return new Variant(cast(GVariant*) p, true);
return new Variant(cast(GVariant*) __p, true);
}
/**
......@@ -344,14 +344,14 @@ public template ActionGroupT(TStruct)
*/
public VariantType getActionStateType(string actionName)
{
auto p = g_action_group_get_action_state_type(getActionGroupStruct(), Str.toStringz(actionName));
auto __p = g_action_group_get_action_state_type(getActionGroupStruct(), Str.toStringz(actionName));
if(p is null)
if(__p is null)
{
return null;
}
return new VariantType(cast(GVariantType*) p);
return new VariantType(cast(GVariantType*) __p);
}
/**
......@@ -437,7 +437,7 @@ public template ActionGroupT(TStruct)
GVariant* outstateHint = null;
GVariant* outstate = null;
auto p = g_action_group_query_action(getActionGroupStruct(), Str.toStringz(actionName), &outenabled, &outparameterType, &outstateType, &outstateHint, &outstate) != 0;
auto __p = g_action_group_query_action(getActionGroupStruct(), Str.toStringz(actionName), &outenabled, &outparameterType, &outstateType, &outstateHint, &outstate) != 0;
enabled = (outenabled == 1);
parameterType = new VariantType(outparameterType);
......@@ -445,7 +445,7 @@ public template ActionGroupT(TStruct)
stateHint = new Variant(outstateHint);
state = new Variant(outstate);
return p;
return __p;
}
/**
......
......@@ -89,7 +89,7 @@ public interface ActionIF{
* @action_name must not be %NULL.
*
* Params:
* actionName = an potential action name
* actionName = a potential action name
*
* Returns: %TRUE if @action_name is valid
*
......@@ -143,7 +143,7 @@ public interface ActionIF{
GVariant* outtargetValue = null;
GError* err = null;
auto p = g_action_parse_detailed_name(Str.toStringz(detailedName), &outactionName, &outtargetValue, &err) != 0;
auto __p = g_action_parse_detailed_name(Str.toStringz(detailedName), &outactionName, &outtargetValue, &err) != 0;
if (err !is null)
{
......@@ -153,7 +153,7 @@ public interface ActionIF{
actionName = Str.toString(outactionName);
targetValue = new Variant(outtargetValue);
return p;
return __p;
}
/**
......
......@@ -139,14 +139,14 @@ public template ActionMapT(TStruct)
*/
public ActionIF lookupAction(string actionName)
{
auto p = g_action_map_lookup_action(getActionMapStruct(), Str.toStringz(actionName));
auto __p = g_action_map_lookup_action(getActionMapStruct(), Str.toStringz(actionName));
if(p is null)
if(__p is null)
{
return null;
}
return ObjectG.getDObject!(ActionIF)(cast(GAction*) p);
return ObjectG.getDObject!(ActionIF)(cast(GAction*) __p);
}
/**
......
......@@ -160,14 +160,14 @@ public template ActionT(TStruct)
*/
public VariantType getParameterType()
{
auto p = g_action_get_parameter_type(getActionStruct());
auto __p = g_action_get_parameter_type(getActionStruct());
if(p is null)
if(__p is null)
{
return null;
}
return new VariantType(cast(GVariantType*) p);
return new VariantType(cast(GVariantType*) __p);
}
/**
......@@ -186,14 +186,14 @@ public template ActionT(TStruct)
*/
public Variant getState()
{
auto p = g_action_get_state(getActionStruct());
auto __p = g_action_get_state(getActionStruct());
if(p is null)
if(__p is null)
{
return null;
}
return new Variant(cast(GVariant*) p, true);
return new Variant(cast(GVariant*) __p, true);
}
/**
......@@ -222,14 +222,14 @@ public template ActionT(TStruct)
*/
public Variant getStateHint()
{
auto p = g_action_get_state_hint(getActionStruct());
auto __p = g_action_get_state_hint(getActionStruct());
if(p is null)
if(__p is null)
{
return null;
}
return new Variant(cast(GVariant*) p, true);
return new Variant(cast(GVariant*) __p, true);
}
/**
......@@ -252,13 +252,13 @@ public template ActionT(TStruct)
*/
public VariantType getStateType()
{
auto p = g_action_get_state_type(getActionStruct());
auto __p = g_action_get_state_type(getActionStruct());
if(p is null)
if(__p is null)
{
return null;
}
return new VariantType(cast(GVariantType*) p);
return new VariantType(cast(GVariantType*) __p);
}
}
......@@ -47,7 +47,7 @@ public import gtkc.giotypes;
* As of GLib 2.20, URIs will always be converted to POSIX paths
* (using g_file_get_path()) when using g_app_info_launch() even if
* the application requested an URI and not a POSIX path. For example
* for an desktop-file based application with Exec key `totem
* for a desktop-file based application with Exec key `totem
* %U` and a single URI, `sftp://foo/file.avi`, then
* `/home/user/.gvfs/sftp on foo/file.avi` will be passed. This will
* only work if a set of suitable GIO extensions (such as gvfs 2.26
......@@ -126,19 +126,19 @@ public interface AppInfoIF{
{
GError* err = null;
auto p = g_app_info_create_from_commandline(Str.toStringz(commandline), Str.toStringz(applicationName), flags, &err);
auto __p = g_app_info_create_from_commandline(Str.toStringz(commandline), Str.toStringz(applicationName), flags, &err);
if (err !is null)
{
throw new GException( new ErrorG(err) );
}
if(p is null)
if(__p is null)
{
return null;
}
return ObjectG.getDObject!(AppInfoIF)(cast(GAppInfo*) p, true);
return ObjectG.getDObject!(AppInfoIF)(cast(GAppInfo*) __p, true);
}
/**
......@@ -155,14 +155,14 @@ public interface AppInfoIF{
*/
public static ListG getAll()
{
auto p = g_app_info_get_all();
auto __p = g_app_info_get_all();
if(p is null)
if(__p is null)
{
return null;
}
return new ListG(cast(GList*) p, true);
return new ListG(cast(GList*) __p, true);
}
/**
......@@ -179,14 +179,14 @@ public interface AppInfoIF{
*/
public static ListG getAllForType(string contentType)
{
auto p = g_app_info_get_all_for_type(Str.toStringz(contentType));
auto __p = g_app_info_get_all_for_type(Str.toStringz(contentType));
if(p is null)
if(__p is null)
{
return null;
}
return new ListG(cast(GList*) p, true);
return new ListG(cast(GList*) __p, true);
}
/**
......@@ -202,14 +202,14 @@ public interface AppInfoIF{
*/
public static AppInfoIF getDefaultForType(string contentType, bool mustSupportUris)
{
auto p = g_app_info_get_default_for_type(Str.toStringz(contentType), mustSupportUris);
auto __p = g_app_info_get_default_for_type(Str.toStringz(contentType), mustSupportUris);
if(p is null)
if(__p is null)
{
return null;
}
return ObjectG.getDObject!(AppInfoIF)(cast(GAppInfo*) p, true);
return ObjectG.getDObject!(AppInfoIF)(cast(GAppInfo*) __p, true);
}
/**
......@@ -225,14 +225,14 @@ public interface AppInfoIF{
*/
public static AppInfoIF getDefaultForUriScheme(string uriScheme)
{
auto p = g_app_info_get_default_for_uri_scheme(Str.toStringz(uriScheme));
auto __p = g_app_info_get_default_for_uri_scheme(Str.toStringz(uriScheme));
if(p is null)
if(__p is null)
{
return null;
}
return ObjectG.getDObject!(AppInfoIF)(cast(GAppInfo*) p, true);
return ObjectG.getDObject!(AppInfoIF)(cast(GAppInfo*) __p, true);
}
/**
......@@ -250,14 +250,14 @@ public interface AppInfoIF{
*/
public static ListG getFallbackForType(string contentType)
{
auto p = g_app_info_get_fallback_for_type(Str.toStringz(contentType));
auto __p = g_app_info_get_fallback_for_type(Str.toStringz(contentType));
if(p is null)
if(__p is null)
{
return null;
}
return new ListG(cast(GList*) p, true);
return new ListG(cast(GList*) __p, true);
}
/**
......@@ -278,14 +278,14 @@ public interface AppInfoIF{
*/
public static ListG getRecommendedForType(string contentType)
{
auto p = g_app_info_get_recommended_for_type(Str.toStringz(contentType));
auto __p = g_app_info_get_recommended_for_type(Str.toStringz(contentType));
if(p is null)
if(__p is null)
{
return null;
}
return new ListG(cast(GList*) p, true);
return new ListG(cast(GList*) __p, true);
}
/**
......@@ -296,7 +296,7 @@ public interface AppInfoIF{
*
* The D-Bus–activated applications don't have to be started if your application
* terminates too soon after this function. To prevent this, use
* g_app_info_launch_default_for_uri() instead.
* g_app_info_launch_default_for_uri_async() instead.
*
* Params:
* uri = the uri to show
......@@ -310,14 +310,14 @@ public interface AppInfoIF{
{
GError* err = null;
auto p = g_app_info_launch_default_for_uri(Str.toStringz(uri), (context is null) ? null : context.getAppLaunchContextStruct(), &err) != 0;
auto __p = g_app_info_launch_default_for_uri(Str.toStringz(uri), (context is null) ? null : context.getAppLaunchContextStruct(), &err) != 0;
if (err !is null)
{
throw new GException( new ErrorG(err) );
}
return p;
return __p;
}
/**
......@@ -362,14 +362,14 @@ public interface AppInfoIF{
{
GError* err = null;
auto p = g_app_info_launch_default_for_uri_finish((result is null) ? null : result.getAsyncResultStruct(), &err) != 0;
auto __p = g_app_info_launch_default_for_uri_finish((result is null) ? null : result.getAsyncResultStruct(), &err) != 0;
if (err !is null)
{
throw new GException( new ErrorG(err) );
}
return p;
return __p;
}
/**
......
......@@ -105,14 +105,14 @@ public class AppInfoMonitor : ObjectG
*/
public static AppInfoMonitor get()
{
auto p = g_app_info_monitor_get();
auto __p = g_app_info_monitor_get();
if(p is null)
if(__p is null)
{
return null;
}
return ObjectG.getDObject!(AppInfoMonitor)(cast(GAppInfoMonitor*) p, true);
return ObjectG.getDObject!(AppInfoMonitor)(cast(GAppInfoMonitor*) __p, true);
}
/**
......
......@@ -47,7 +47,7 @@ public import gtkc.giotypes;
* As of GLib 2.20, URIs will always be converted to POSIX paths
* (using g_file_get_path()) when using g_app_info_launch() even if
* the application requested an URI and not a POSIX path. For example
* for an desktop-file based application with Exec key `totem
* for a desktop-file based application with Exec key `totem
* %U` and a single URI, `sftp://foo/file.avi`, then
* `/home/user/.gvfs/sftp on foo/file.avi` will be passed. This will
* only work if a set of suitable GIO extensions (such as gvfs 2.26
......@@ -116,14 +116,14 @@ public template AppInfoT(TStruct)
{
GError* err = null;
auto p = g_app_info_add_supports_type(getAppInfoStruct(), Str.toStringz(contentType), &err) != 0;
auto __p = g_app_info_add_supports_type(getAppInfoStruct(), Str.toStringz(contentType), &err) != 0;
if (err !is null)
{
throw new GException( new ErrorG(err) );
}
return p;
return __p;
}
/**
......@@ -174,14 +174,14 @@ public template AppInfoT(TStruct)
*/
public AppInfoIF dup()
{
auto p = g_app_info_dup(getAppInfoStruct());
auto __p = g_app_info_dup(getAppInfoStruct());
if(p is null)
if(__p is null)
{
return null;
}
return ObjectG.getDObject!(AppInfoIF)(cast(GAppInfo*) p, true);
return ObjectG.getDObject!(AppInfoIF)(cast(GAppInfo*) __p, true);
}
/**
......@@ -259,14 +259,14 @@ public template AppInfoT(TStruct)
*/
public IconIF getIcon()
{
auto p = g_app_info_get_icon(getAppInfoStruct());
auto __p = g_app_info_get_icon(getAppInfoStruct());
if(p is null)
if(__p is null)
{
return null;
}
return ObjectG.getDObject!(IconIF)(cast(GIcon*) p);
return ObjectG.getDObject!(IconIF)(cast(GIcon*) __p);
}
/**
......@@ -353,14 +353,14 @@ public template AppInfoT(TStruct)
{
GError* err = null;
auto p = g_app_info_launch(getAppInfoStruct(), (files is null) ? null : files.getListGStruct(), (context is null) ? null : context.getAppLaunchContextStruct(), &err) != 0;
auto __p = g_app_info_launch(getAppInfoStruct(), (files is null) ? null : files.getListGStruct(), (context is null) ? null : context.getAppLaunchContextStruct(), &err) != 0;
if (err !is null)
{
throw new GException( new ErrorG(err) );
}
return p;
return __p;
}
/**
......@@ -387,14 +387,14 @@ public template AppInfoT(TStruct)
{
GError* err = null;
auto p = g_app_info_launch_uris(getAppInfoStruct(), (uris is null) ? null : uris.getListGStruct(), (context is null) ? null : context.getAppLaunchContextStruct(), &err) != 0;
auto __p = g_app_info_launch_uris(getAppInfoStruct(), (uris is null) ? null : uris.getListGStruct(), (context is null) ? null : context.getAppLaunchContextStruct(), &err) != 0;
if (err !is null)
{
throw new GException( new ErrorG(err) );
}
return p;
return __p;
}
/**
......@@ -435,14 +435,14 @@ public template AppInfoT(TStruct)
{
GError* err = null;
auto p = g_app_info_launch_uris_finish(getAppInfoStruct(), (result is null) ? null : result.getAsyncResultStruct(), &err) != 0;
auto __p = g_app_info_launch_uris_finish(getAppInfoStruct(), (result is null) ? null : result.getAsyncResultStruct(), &err) != 0;
if (err !is null)
{
throw new GException( new ErrorG(err) );
}
return p;
return __p;
}
/**
......@@ -459,14 +459,14 @@ public template AppInfoT(TStruct)
{
GError* err = null;
auto p = g_app_info_remove_supports_type(getAppInfoStruct(), Str.toStringz(contentType), &err) != 0;
auto __p = g_app_info_remove_supports_type(getAppInfoStruct(), Str.toStringz(contentType), &err) != 0;
if (err !is null)
{
throw new GException( new ErrorG(err) );
}
return p;
return __p;
}
/**
......@@ -484,14 +484,14 @@ public template AppInfoT(TStruct)
{
GError* err = null;
auto p = g_app_info_set_as_default_for_extension(getAppInfoStruct(), Str.toStringz(extension), &err) != 0;
auto __p = g_app_info_set_as_default_for_extension(getAppInfoStruct(), Str.toStringz(extension), &err) != 0;
if (err !is null)
{
throw new GException( new ErrorG(err) );
}
return p;
return __p;
}
/**
......@@ -508,14 +508,14 @@ public template AppInfoT(TStruct)
{
GError* err = null;
auto p = g_app_info_set_as_default_for_type(getAppInfoStruct(), Str.toStringz(contentType), &err) != 0;
auto __p = g_app_info_set_as_default_for_type(getAppInfoStruct(), Str.toStringz(contentType), &err) != 0;
if (err !is null)
{
throw new GException( new ErrorG(err) );
}
return p;
return __p;
}
/**
......@@ -535,14 +535,14 @@ public template AppInfoT(TStruct)
{
GError* err = null;
auto p = g_app_info_set_as_last_used_for_type(getAppInfoStruct(), Str.toStringz(contentType), &err) != 0;
auto __p = g_app_info_set_as_last_used_for_type(getAppInfoStruct(), Str.toStringz(contentType), &err) != 0;
if (err !is null)
{
throw new GException( new ErrorG(err) );
}
return p;
return __p;
}
/**
......
......@@ -88,14 +88,14 @@ public class AppLaunchContext : ObjectG
*/
public this()
{
auto p = g_app_launch_context_new();
auto __p = g_app_launch_context_new();
if(p is null)
if(__p is null)
{
throw new ConstructionException("null returned by new");
}
this(cast(GAppLaunchContext*) p, true);
this(cast(GAppLaunchContext*) __p, true);
}
/**
......@@ -140,7 +140,7 @@ public class AppLaunchContext : ObjectG
* `DESKTOP_STARTUP_ID` for the launched operation, if supported.
*
* Startup notification IDs are defined in the
* [FreeDesktop.Org Startup Notifications standard](http://standards.freedesktop.org/startup-notification-spec/startup-notification-latest.txt").
* [FreeDesktop.Org Startup Notifications standard](http://standards.freedesktop.org/startup-notification-spec/startup-notification-latest.txt).
*
* Params:
* info = a #GAppInfo
......
......@@ -129,7 +129,7 @@ private import std.algorithm;
* initialization for all of these in a single place.