[glibmm] Remove no_default_handler in some _WRAP_SIGNAL()s



commit 38c49e5c8e9b5eb73e3a6fb196dd3db4bb04e78e
Author: Kjell Ahlstedt <kjell ahlstedt bredband net>
Date:   Wed Nov 30 12:03:23 2016 +0100

    Remove no_default_handler in some _WRAP_SIGNAL()s
    
    Remove the no_default_handler argument in _WRAP_SIGNAL() where it was added
    only to avoid breaking ABI.

 gio/src/application.hg    |    7 +++----
 gio/src/drive.hg          |   16 ++++------------
 gio/src/mount.hg          |    2 +-
 gio/src/mountoperation.hg |    8 ++------
 gio/src/resolver.hg       |    3 +--
 gio/src/socketclient.hg   |    4 +---
 gio/src/volumemonitor.hg  |    5 ++---
 7 files changed, 14 insertions(+), 31 deletions(-)
---
diff --git a/gio/src/application.hg b/gio/src/application.hg
index ea752fe..8c4d80f 100644
--- a/gio/src/application.hg
+++ b/gio/src/application.hg
@@ -372,8 +372,7 @@ public:
 
   _WRAP_SIGNAL(void startup(), "startup")
 
-  //TODO: Remove no_default_handler when we can break ABI
-  _WRAP_SIGNAL(void shutdown(), "shutdown", no_default_handler, newin "2,46")
+  _WRAP_SIGNAL(void shutdown(), "shutdown", newin "2,46")
 
   _WRAP_SIGNAL(void activate(), "activate")
 
@@ -385,12 +384,12 @@ public:
 #m4 _CONVERSION(`GApplicationCommandLine*', `const Glib::RefPtr<ApplicationCommandLine>&',`Glib::wrap($3, 
true)')
   _WRAP_SIGNAL(int command_line(const Glib::RefPtr<ApplicationCommandLine>& command_line), "command-line")
 
-  //TODO: Remove no_default_handler when we can break ABI
   //TODO: Avoid the use of the Variants in the VariantDict?
   //options must be non-const. The handler is meant to modify it. See the description
   //of add_main_option_entry(OptionType, ...).
 #m4 _CONVERSION(`GVariantDict*',`const Glib::RefPtr<Glib::VariantDict>&',`Glib::wrap($3, true)')
-  _WRAP_SIGNAL(int handle_local_options(const Glib::RefPtr<Glib::VariantDict>& options), 
"handle-local-options", no_default_handler)
+#m4 _CONVERSION(`const Glib::RefPtr<Glib::VariantDict>&',`GVariantDict*',__CONVERT_REFPTR_TO_P)
+  _WRAP_SIGNAL(int handle_local_options(const Glib::RefPtr<Glib::VariantDict>& options), 
"handle-local-options")
 
 protected:
   virtual void on_open(const type_vec_files& files, const Glib::ustring& hint);
diff --git a/gio/src/drive.hg b/gio/src/drive.hg
index a4eecee..0b87d19 100644
--- a/gio/src/drive.hg
+++ b/gio/src/drive.hg
@@ -153,18 +153,10 @@ public:
 
   _WRAP_METHOD(Glib::ustring get_sort_key() const,  g_drive_get_sort_key)
 
-  /** @newin{2,20}
-   */
-  _WRAP_SIGNAL(void changed(), changed, no_default_handler)
-
-  /** @newin{2,20}
-   */
-  _WRAP_SIGNAL(void disconnected(), disconnected, no_default_handler)
-
-  /** @newin{2,20}
-   */
-  _WRAP_SIGNAL(void eject_button(), eject_button, no_default_handler)
-  _WRAP_SIGNAL(void stop_button(), stop_button, no_default_handler)
+  _WRAP_SIGNAL(void changed(), changed, newin "2,20")
+  _WRAP_SIGNAL(void disconnected(), disconnected, newin "2,20")
+  _WRAP_SIGNAL(void eject_button(), eject_button, newin "2,20")
+  _WRAP_SIGNAL(void stop_button(), stop_button)
 
   //_WRAP_VFUNC(Glib::ustring get_name() const, get_name)
   //Careful of ref-counting: //_WRAP_VFUNC(Glib::RefPtr<Icon> get_icon() const, get_icon)
diff --git a/gio/src/mount.hg b/gio/src/mount.hg
index 4ad4790..3988452 100644
--- a/gio/src/mount.hg
+++ b/gio/src/mount.hg
@@ -232,7 +232,7 @@ public:
 
   _WRAP_SIGNAL(void changed(), changed)
   _WRAP_SIGNAL(void unmounted(), unmounted)
-  _WRAP_SIGNAL(void pre_unmount(), pre_unmount, no_default_handler)
+  _WRAP_SIGNAL(void pre_unmount(), pre_unmount)
 
   //There are no properties.
 };
diff --git a/gio/src/mountoperation.hg b/gio/src/mountoperation.hg
index 450de59..a13ed1b 100644
--- a/gio/src/mountoperation.hg
+++ b/gio/src/mountoperation.hg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2007 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -87,14 +85,12 @@ public:
   _WRAP_SIGNAL(void ask_question(const Glib::ustring& message, const Glib::StringArrayHandle& choices), 
ask_question)
 
   _WRAP_SIGNAL(void reply(MountOperationResult result), reply)
-
-  //TODO: Remove no_default_handler when we can break ABI:
-  _WRAP_SIGNAL(void aborted(), aborted, no_default_handler)
+  _WRAP_SIGNAL(void aborted(), aborted)
 
   //TODO: The array of char* is not very pleasant to wrap:
   //_WRAP_SIGNAL( void show_processes(const Glib::ustring& message, GArray* processes, const gchar 
*choices[]);
 
-  _WRAP_SIGNAL(void show_unmount_progress(const Glib::ustring& message, gint64 time_left, gint64 
bytes_left), "show_unmount_progress", no_default_handler)
+  _WRAP_SIGNAL(void show_unmount_progress(const Glib::ustring& message, gint64 time_left, gint64 
bytes_left), "show_unmount_progress")
 
   _WRAP_PROPERTY("username", Glib::ustring)
   _WRAP_PROPERTY("password", Glib::ustring)
diff --git a/gio/src/resolver.hg b/gio/src/resolver.hg
index a958b07..67258e5 100644
--- a/gio/src/resolver.hg
+++ b/gio/src/resolver.hg
@@ -164,8 +164,7 @@ public:
 
   _WRAP_METHOD(std::vector<Glib::VariantContainerBase> lookup_records_finish(const 
Glib::RefPtr<AsyncResult>& result), g_resolver_lookup_records_finish, errthrow)
 
-  //TODO: Remove no_default_handler when we can break ABI:
-  _WRAP_SIGNAL(void reload(), reload, no_default_handler)
+  _WRAP_SIGNAL(void reload(), reload)
 };
 
 std::string hostname_to_ascii (const Glib::ustring& hostname);
diff --git a/gio/src/socketclient.hg b/gio/src/socketclient.hg
index 16257f7..5867943 100644
--- a/gio/src/socketclient.hg
+++ b/gio/src/socketclient.hg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2010 Jonathon Jongsma
  *
  * This library is free software; you can redistribute it and/or
@@ -171,7 +169,7 @@ public:
 
 #m4 _CONVERSION(`GSocketConnectable*',`const Glib::RefPtr<SocketConnectable>&',`Glib::wrap($3)')
 #m4 _CONVERSION(`GIOStream*',`const Glib::RefPtr<IOStream>&',`Glib::wrap($3)')
-  _WRAP_SIGNAL(void event(SocketClientEvent event, const Glib::RefPtr<SocketConnectable>& connectable, const 
Glib::RefPtr<IOStream>& connection), event, no_default_handler)
+  _WRAP_SIGNAL(void event(SocketClientEvent event, const Glib::RefPtr<SocketConnectable>& connectable, const 
Glib::RefPtr<IOStream>& connection), event)
 };
 
 } // namespace Gio
diff --git a/gio/src/volumemonitor.hg b/gio/src/volumemonitor.hg
index f12976f..b55fc7d 100644
--- a/gio/src/volumemonitor.hg
+++ b/gio/src/volumemonitor.hg
@@ -73,9 +73,8 @@ public:
   _WRAP_SIGNAL(void drive_disconnected(const Glib::RefPtr<Drive>& drive), drive_disconnected)
   _WRAP_SIGNAL(void drive_changed(const Glib::RefPtr<Drive>& drive), drive_changed)
 
-  //TODO: Remove no_default_handler when we can break ABI:
-  _WRAP_SIGNAL(void drive_eject_button(const Glib::RefPtr<Drive>& drive), drive_eject_button, 
no_default_handler)
-  _WRAP_SIGNAL(void drive_stop_button(const Glib::RefPtr<Drive>& drive), drive_stop_button, 
no_default_handler)
+  _WRAP_SIGNAL(void drive_eject_button(const Glib::RefPtr<Drive>& drive), drive_eject_button)
+  _WRAP_SIGNAL(void drive_stop_button(const Glib::RefPtr<Drive>& drive), drive_stop_button)
 
   //TODO: Use ListHandle?
   //_WRAP_VFUNC(GList* get_volumes(), get_volumes)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]