Merge pull request gtk-rs#10 from gkoz/update

Update
Stinkstudios · Oct 13, 2015 · 52d916b · 52d916b
2 parents a043ef0 + a39a745
commit 52d916b
Show file tree

Hide file tree

Showing 18 changed files with 68 additions and 76 deletions.
diff --git a/Makefile b/Makefile
@@ -5,7 +5,7 @@ LIBS = $(CONFIGS:conf/gir-%.toml=%-sys/src/lib.rs)
 libs : $(LIBS)
 
 %-sys/src/lib.rs : conf/gir-%.toml $(GIR)
-	$(GIR) -c $< -o $(abspath $*-sys) -m sys
+	$(GIR) -c $< -o $(abspath $*-sys) -d gir-files
 
 $(GIR) : gir/Cargo.toml gir/Cargo.lock gir/build.rs $(shell find gir/src -name '*.rs')
 	cd gir && cargo build --release

diff --git a/atk-sys/src/lib.rs b/atk-sys/src/lib.rs
@@ -1,4 +1,4 @@
-// This file was generated by gir (eb0f7a7) from gir-files (11e0e6d)
+// This file was generated by gir (df8a3f3) from gir-files (11e0e6d)
 // DO NOT EDIT
 
 #![allow(non_camel_case_types, non_upper_case_globals)]

diff --git a/conf/gir-atk.toml b/conf/gir-atk.toml
@@ -1,6 +1,5 @@
 [options]
-work_mode = "normal"
-girs_dir = "gir-files"
+work_mode = "sys"
 library = "Atk"
 version = "1.0"
 min_cfg_version = "2.4"

diff --git a/conf/gir-gdk-pixbuf.toml b/conf/gir-gdk-pixbuf.toml
@@ -1,6 +1,5 @@
 [options]
-work_mode = "normal"
-girs_dir = "gir-files"
+work_mode = "sys"
 library = "GdkPixbuf"
 version = "2.0"
 min_cfg_version = "2.26"

diff --git a/conf/gir-gdk.toml b/conf/gir-gdk.toml
@@ -1,6 +1,5 @@
 [options]
-work_mode = "normal"
-girs_dir = "gir-files"
+work_mode = "sys"
 library = "Gdk"
 version = "3.0"
 min_cfg_version = "3.4"

diff --git a/conf/gir-gio.toml b/conf/gir-gio.toml
@@ -1,6 +1,5 @@
 [options]
-work_mode = "normal"
-girs_dir = "gir-files"
+work_mode = "sys"
 library = "Gio"
 version = "2.0"
 min_cfg_version = "2.32"

diff --git a/conf/gir-glib.toml b/conf/gir-glib.toml
@@ -1,6 +1,5 @@
 [options]
-work_mode = "normal"
-girs_dir = "gir-files"
+work_mode = "sys"
 library = "GLib"
 version = "2.0"
 min_cfg_version = "2.32"

diff --git a/conf/gir-gobject.toml b/conf/gir-gobject.toml
@@ -1,6 +1,5 @@
 [options]
-work_mode = "normal"
-girs_dir = "gir-files"
+work_mode = "sys"
 library = "GObject"
 version = "2.0"
 min_cfg_version = "2.32"

diff --git a/conf/gir-gtk.toml b/conf/gir-gtk.toml
@@ -1,6 +1,5 @@
 [options]
-work_mode = "normal"
-girs_dir = "gir-files"
+work_mode = "sys"
 library = "Gtk"
 version = "3.0"
 min_cfg_version = "3.4"

diff --git a/conf/gir-pango.toml b/conf/gir-pango.toml
@@ -1,6 +1,5 @@
 [options]
-work_mode = "normal"
-girs_dir = "gir-files"
+work_mode = "sys"
 library = "Pango"
 version = "1.0"
 min_cfg_version = "1.30"

diff --git a/gdk-pixbuf-sys/src/lib.rs b/gdk-pixbuf-sys/src/lib.rs
@@ -1,4 +1,4 @@
-// This file was generated by gir (eb0f7a7) from gir-files (11e0e6d)
+// This file was generated by gir (df8a3f3) from gir-files (11e0e6d)
 // DO NOT EDIT
 
 #![allow(non_camel_case_types, non_upper_case_globals)]

diff --git a/gdk-sys/src/lib.rs b/gdk-sys/src/lib.rs
@@ -1,4 +1,4 @@
-// This file was generated by gir (eb0f7a7) from gir-files (11e0e6d)
+// This file was generated by gir (df8a3f3) from gir-files (11e0e6d)
 // DO NOT EDIT
 
 #![allow(non_camel_case_types, non_upper_case_globals)]
@@ -4013,7 +4013,7 @@ extern "C" {
     pub fn gdk_window_set_transient_for(window: *mut GdkWindow, parent: *mut GdkWindow);
     pub fn gdk_window_set_type_hint(window: *mut GdkWindow, hint: GdkWindowTypeHint);
     pub fn gdk_window_set_urgency_hint(window: *mut GdkWindow, urgent: gboolean);
-    pub fn gdk_window_set_user_data(window: *mut GdkWindow, user_data: gpointer);
+    pub fn gdk_window_set_user_data(window: *mut GdkWindow, user_data: *mut gobject::GObject);
     pub fn gdk_window_shape_combine_region(window: *mut GdkWindow, shape_region: *const cairo::cairo_region_t, offset_x: c_int, offset_y: c_int);
     pub fn gdk_window_show(window: *mut GdkWindow);
     pub fn gdk_window_show_unraised(window: *mut GdkWindow);

diff --git a/gio-sys/src/lib.rs b/gio-sys/src/lib.rs
@@ -1,4 +1,4 @@
-// This file was generated by gir (eb0f7a7) from gir-files (11e0e6d)
+// This file was generated by gir (df8a3f3) from gir-files (11e0e6d)
 // DO NOT EDIT
 
 #![allow(non_camel_case_types, non_upper_case_globals)]
@@ -1317,7 +1317,7 @@ pub type GSettingsBindSetMapping = Option<unsafe extern "C" fn(*const gobject::G
 pub type GSettingsGetMapping = Option<unsafe extern "C" fn(*mut glib::GVariant, *mut gpointer, gpointer) -> gboolean>;
 pub type GSimpleAsyncThreadFunc = Option<unsafe extern "C" fn(*mut GSimpleAsyncResult, *mut gobject::GObject, *mut GCancellable)>;
 pub type GSocketSourceFunc = Option<unsafe extern "C" fn(*mut GSocket, glib::GIOCondition, gpointer) -> gboolean>;
-pub type GTaskThreadFunc = Option<unsafe extern "C" fn(*mut GTask, gpointer, gpointer, *mut GCancellable)>;
+pub type GTaskThreadFunc = Option<unsafe extern "C" fn(*mut GTask, *mut gobject::GObject, gpointer, *mut GCancellable)>;
 
 #[repr(C)]
 pub struct GActionEntry {
@@ -3548,7 +3548,7 @@ extern "C" {
     #[cfg(gio_2_40)]
     pub fn g_application_add_option_group(application: *mut GApplication, group: *mut glib::GOptionGroup);
     #[cfg(gio_2_44)]
-    pub fn g_application_bind_busy_property(application: *mut GApplication, object: gpointer, property: *const c_char);
+    pub fn g_application_bind_busy_property(application: *mut GApplication, object: *mut gobject::GObject, property: *const c_char);
     pub fn g_application_get_application_id(application: *mut GApplication) -> *const c_char;
     #[cfg(gio_2_34)]
     pub fn g_application_get_dbus_connection(application: *mut GApplication) -> *mut GDBusConnection;
@@ -3582,7 +3582,7 @@ extern "C" {
     #[cfg(gio_2_42)]
     pub fn g_application_set_resource_base_path(application: *mut GApplication, resource_path: *const c_char);
     #[cfg(gio_2_44)]
-    pub fn g_application_unbind_busy_property(application: *mut GApplication, object: gpointer, property: *const c_char);
+    pub fn g_application_unbind_busy_property(application: *mut GApplication, object: *mut gobject::GObject, property: *const c_char);
     #[cfg(gio_2_38)]
     pub fn g_application_unmark_busy(application: *mut GApplication);
     #[cfg(gio_2_40)]
@@ -4632,7 +4632,7 @@ extern "C" {
     //=========================================================================
     pub fn g_property_action_get_type() -> GType;
     #[cfg(gio_2_38)]
-    pub fn g_property_action_new(name: *const c_char, object: gpointer, property_name: *const c_char) -> *mut GPropertyAction;
+    pub fn g_property_action_new(name: *const c_char, object: *mut gobject::GObject, property_name: *const c_char) -> *mut GPropertyAction;
 
     //=========================================================================
     // GProxyAddress
@@ -4691,11 +4691,11 @@ extern "C" {
     pub fn g_settings_list_relocatable_schemas() -> *const *const c_char;
     pub fn g_settings_list_schemas() -> *const *const c_char;
     pub fn g_settings_sync();
-    pub fn g_settings_unbind(object: gpointer, property: *const c_char);
+    pub fn g_settings_unbind(object: *mut gobject::GObject, property: *const c_char);
     pub fn g_settings_apply(settings: *mut GSettings);
-    pub fn g_settings_bind(settings: *mut GSettings, key: *const c_char, object: gpointer, property: *const c_char, flags: GSettingsBindFlags);
-    pub fn g_settings_bind_with_mapping(settings: *mut GSettings, key: *const c_char, object: gpointer, property: *const c_char, flags: GSettingsBindFlags, get_mapping: GSettingsBindGetMapping, set_mapping: GSettingsBindSetMapping, user_data: gpointer, destroy: glib::GDestroyNotify);
-    pub fn g_settings_bind_writable(settings: *mut GSettings, key: *const c_char, object: gpointer, property: *const c_char, inverted: gboolean);
+    pub fn g_settings_bind(settings: *mut GSettings, key: *const c_char, object: *mut gobject::GObject, property: *const c_char, flags: GSettingsBindFlags);
+    pub fn g_settings_bind_with_mapping(settings: *mut GSettings, key: *const c_char, object: *mut gobject::GObject, property: *const c_char, flags: GSettingsBindFlags, get_mapping: GSettingsBindGetMapping, set_mapping: GSettingsBindSetMapping, user_data: gpointer, destroy: glib::GDestroyNotify);
+    pub fn g_settings_bind_writable(settings: *mut GSettings, key: *const c_char, object: *mut gobject::GObject, property: *const c_char, inverted: gboolean);
     #[cfg(gio_2_32)]
     pub fn g_settings_create_action(settings: *mut GSettings, key: *const c_char) -> *mut GAction;
     pub fn g_settings_delay(settings: *mut GSettings);
@@ -5088,13 +5088,13 @@ extern "C" {
     //=========================================================================
     pub fn g_task_get_type() -> GType;
     #[cfg(gio_2_36)]
-    pub fn g_task_new(source_object: gpointer, cancellable: *mut GCancellable, callback: GAsyncReadyCallback, callback_data: gpointer) -> *mut GTask;
+    pub fn g_task_new(source_object: *mut gobject::GObject, cancellable: *mut GCancellable, callback: GAsyncReadyCallback, callback_data: gpointer) -> *mut GTask;
     #[cfg(gio_2_36)]
-    pub fn g_task_is_valid(result: gpointer, source_object: gpointer) -> gboolean;
+    pub fn g_task_is_valid(result: *mut GAsyncResult, source_object: *mut gobject::GObject) -> gboolean;
     #[cfg(gio_2_36)]
-    pub fn g_task_report_error(source_object: gpointer, callback: GAsyncReadyCallback, callback_data: gpointer, source_tag: gpointer, error: *mut glib::GError);
+    pub fn g_task_report_error(source_object: *mut gobject::GObject, callback: GAsyncReadyCallback, callback_data: gpointer, source_tag: gpointer, error: *mut glib::GError);
     #[cfg(gio_2_36)]
-    pub fn g_task_report_new_error(source_object: gpointer, callback: GAsyncReadyCallback, callback_data: gpointer, source_tag: gpointer, domain: glib::GQuark, code: c_int, format: *const c_char, ...);
+    pub fn g_task_report_new_error(source_object: *mut gobject::GObject, callback: GAsyncReadyCallback, callback_data: gpointer, source_tag: gpointer, domain: glib::GQuark, code: c_int, format: *const c_char, ...);
     #[cfg(gio_2_36)]
     pub fn g_task_attach_source(task: *mut GTask, source: *mut glib::GSource, callback: glib::GSourceFunc);
     #[cfg(gio_2_36)]
@@ -5110,7 +5110,7 @@ extern "C" {
     #[cfg(gio_2_36)]
     pub fn g_task_get_return_on_cancel(task: *mut GTask) -> gboolean;
     #[cfg(gio_2_36)]
-    pub fn g_task_get_source_object(task: *mut GTask) -> gpointer;
+    pub fn g_task_get_source_object(task: *mut GTask) -> *mut gobject::GObject;
     #[cfg(gio_2_36)]
     pub fn g_task_get_source_tag(task: *mut GTask) -> gpointer;
     #[cfg(gio_2_36)]
@@ -5757,17 +5757,17 @@ extern "C" {
     // GInitable
     //=========================================================================
     pub fn g_initable_get_type() -> GType;
-    pub fn g_initable_new(object_type: GType, cancellable: *mut GCancellable, error: *mut *mut glib::GError, first_property_name: *const c_char, ...) -> gpointer;
+    pub fn g_initable_new(object_type: GType, cancellable: *mut GCancellable, error: *mut *mut glib::GError, first_property_name: *const c_char, ...) -> *mut gobject::GObject;
     //pub fn g_initable_new_valist(object_type: GType, first_property_name: *const c_char, var_args: [Unsupported type va_list], cancellable: *mut GCancellable, error: *mut *mut glib::GError) -> *mut gobject::GObject;
-    pub fn g_initable_newv(object_type: GType, n_parameters: c_uint, parameters: *mut gobject::GParameter, cancellable: *mut GCancellable, error: *mut *mut glib::GError) -> gpointer;
+    pub fn g_initable_newv(object_type: GType, n_parameters: c_uint, parameters: *mut gobject::GParameter, cancellable: *mut GCancellable, error: *mut *mut glib::GError) -> *mut gobject::GObject;
     pub fn g_initable_init(initable: *mut GInitable, cancellable: *mut GCancellable, error: *mut *mut glib::GError) -> gboolean;
 
     //=========================================================================
     // GListModel
     //=========================================================================
     pub fn g_list_model_get_type() -> GType;
     #[cfg(gio_2_44)]
-    pub fn g_list_model_get_item(list: *mut GListModel, position: c_uint) -> gpointer;
+    pub fn g_list_model_get_item(list: *mut GListModel, position: c_uint) -> *mut gobject::GObject;
     #[cfg(gio_2_44)]
     pub fn g_list_model_get_item_type(list: *mut GListModel) -> GType;
     #[cfg(gio_2_44)]
@@ -6020,7 +6020,7 @@ extern "C" {
     pub fn g_networking_init();
     pub fn g_pollable_source_new(pollable_stream: *mut gobject::GObject) -> *mut glib::GSource;
     #[cfg(gio_2_34)]
-    pub fn g_pollable_source_new_full(pollable_stream: gpointer, child_source: *mut glib::GSource, cancellable: *mut GCancellable) -> *mut glib::GSource;
+    pub fn g_pollable_source_new_full(pollable_stream: *mut gobject::GObject, child_source: *mut glib::GSource, cancellable: *mut GCancellable) -> *mut glib::GSource;
     #[cfg(gio_2_34)]
     pub fn g_pollable_stream_read(stream: *mut GInputStream, buffer: *mut u8, count: size_t, blocking: gboolean, cancellable: *mut GCancellable, error: *mut *mut glib::GError) -> ssize_t;
     #[cfg(gio_2_34)]

diff --git a/gir b/gir
diff --git a/glib-sys/src/lib.rs b/glib-sys/src/lib.rs
@@ -1,4 +1,4 @@
-// This file was generated by gir (eb0f7a7) from gir-files (11e0e6d)
+// This file was generated by gir (df8a3f3) from gir-files (11e0e6d)
 // DO NOT EDIT
 
 #![allow(non_camel_case_types, non_upper_case_globals)]