Switched to gtkmm 2.4+ since gtkmm 2.0 is being removed from Debian.

[videolink.git] / browser_widget.cpp

diff --git a/browser_widget.cpp b/browser_widget.cpp
index 7d640e5cfd358cfa6836a5b1335ec8a3c8e4e5b9..46d1fb5e0ba97706c4d72414b9dad053464c9046 100644 (file)
--- a/browser_widget.cpp
+++ b/browser_widget.cpp
@@ -119,15 +119,15 @@ namespace
 {
     void browser_widget_signal_link_message_callback(GtkMozEmbed * self, void * data)
     {
-       typedef SigC::Slot0<void> SlotType;
+       typedef sigc::slot<void> SlotType;
 
        if (Glib::ObjectBase::_get_current_wrapper((GObject *)self))
        {
            try
            {
-               if (SigC::SlotNode * const slot =
+               if (sigc::slot_base * const slot =
                    Glib::SignalProxyNormal::data_to_slot(data))
-                   (*(SlotType::Proxy)(slot->proxy_))(slot);
+                   (*static_cast<SlotType*>(slot))();
            }
            catch(...)
            {
@@ -145,15 +145,15 @@ namespace
 
     void browser_widget_signal_js_status_callback(GtkMozEmbed * self, void * data)
     {
-       typedef SigC::Slot0<void> SlotType;
+       typedef sigc::slot<void> SlotType;
 
        if (Glib::ObjectBase::_get_current_wrapper((GObject *)self))
        {
            try
            {
-               if (SigC::SlotNode * const slot =
+               if (sigc::slot_base * const slot =
                    Glib::SignalProxyNormal::data_to_slot(data))
-                   (*(SlotType::Proxy)(slot->proxy_))(slot);
+                   (*static_cast<SlotType*>(slot))();
            }
            catch(...)
            {
@@ -171,15 +171,15 @@ namespace
 
     void browser_widget_signal_location_callback(GtkMozEmbed * self, void * data)
     {
-       typedef SigC::Slot0<void> SlotType;
+       typedef sigc::slot<void> SlotType;
 
        if (Glib::ObjectBase::_get_current_wrapper((GObject *)self))
        {
            try
            {
-               if (SigC::SlotNode * const slot =
+               if (sigc::slot_base * const slot =
                    Glib::SignalProxyNormal::data_to_slot(data))
-                   (*(SlotType::Proxy)(slot->proxy_))(slot);
+                   (*static_cast<SlotType*>(slot))();
            }
            catch(...)
            {
@@ -197,15 +197,15 @@ namespace
 
     void browser_widget_signal_title_callback(GtkMozEmbed * self, void * data)
     {
-       typedef SigC::Slot0<void> SlotType;
+       typedef sigc::slot<void> SlotType;
 
        if (Glib::ObjectBase::_get_current_wrapper((GObject *)self))
        {
            try
            {
-               if (SigC::SlotNode * const slot =
+               if (sigc::slot_base * const slot =
                    Glib::SignalProxyNormal::data_to_slot(data))
-                   (*(SlotType::Proxy)(slot->proxy_))(slot);
+                   (*static_cast<SlotType*>(slot))();
            }
            catch(...)
            {
@@ -224,15 +224,15 @@ namespace
     void browser_widget_signal_progress_callback(
        GtkMozEmbed * self, gint p0, gint p1, void * data)
     {
-       typedef SigC::Slot2<void, gint, gint> SlotType;
+       typedef sigc::slot<void, gint, gint> SlotType;
 
        if (Glib::ObjectBase::_get_current_wrapper((GObject *)self))
        {
            try
            {
-               if (SigC::SlotNode * const slot =
+               if (sigc::slot_base * const slot =
                    Glib::SignalProxyNormal::data_to_slot(data))
-                   (*(SlotType::Proxy)(slot->proxy_))(p0, p1, slot);
+                   (*static_cast<SlotType*>(slot))(p0, p1);
            }
            catch(...)
            {
@@ -251,15 +251,15 @@ namespace
     void browser_widget_signal_net_state_callback(
        GtkMozEmbed * self, const char * p0, gint p1, guint p2, void * data)
     {
-       typedef SigC::Slot3<void, const char *, gint, guint> SlotType;
+       typedef sigc::slot<void, const char *, gint, guint> SlotType;
 
        if (Glib::ObjectBase::_get_current_wrapper((GObject *)self))
        {
            try
            {
-               if (SigC::SlotNode * const slot =
+               if (sigc::slot_base * const slot =
                    Glib::SignalProxyNormal::data_to_slot(data))
-                   (*(SlotType::Proxy)(slot->proxy_))(p0, p1, p2, slot);
+                   (*static_cast<SlotType*>(slot))(p0, p1, p2);
            }
            catch(...)
            {
@@ -277,15 +277,15 @@ namespace
 
     void browser_widget_signal_net_start_callback(GtkMozEmbed * self, void * data)
     {
-       typedef SigC::Slot0<void> SlotType;
+       typedef sigc::slot<void> SlotType;
 
        if (Glib::ObjectBase::_get_current_wrapper((GObject *)self))
        {
            try
            {
-               if (SigC::SlotNode * const slot =
+               if (sigc::slot_base * const slot =
                    Glib::SignalProxyNormal::data_to_slot(data))
-                   (*(SlotType::Proxy)(slot->proxy_))(slot);
+                   (*static_cast<SlotType*>(slot))();
            }
            catch(...)
            {
@@ -303,15 +303,15 @@ namespace
 
     void browser_widget_signal_net_stop_callback(GtkMozEmbed * self, void * data)
     {
-       typedef SigC::Slot0<void> SlotType;
+       typedef sigc::slot<void> SlotType;
 
        if (Glib::ObjectBase::_get_current_wrapper((GObject *)self))
        {
            try
            {
-               if (SigC::SlotNode * const slot =
+               if (sigc::slot_base * const slot =
                    Glib::SignalProxyNormal::data_to_slot(data))
-                   (*(SlotType::Proxy)(slot->proxy_))(slot);
+                   (*static_cast<SlotType*>(slot))();
            }
            catch(...)
            {
@@ -330,17 +330,17 @@ namespace
     void browser_widget_signal_new_window_callback(
        GtkMozEmbed * self, GtkMozEmbed ** p0, guint p1, void * data)
     {
-       typedef SigC::Slot1<browser_widget *, guint> SlotType;
+       typedef sigc::slot<browser_widget *, guint> SlotType;
 
        if (Glib::ObjectBase::_get_current_wrapper((GObject *)self))
        {
            try
            {
-               if (SigC::SlotNode * const slot =
+               if (sigc::slot_base * const slot =
                    Glib::SignalProxyNormal::data_to_slot(data))
                {
                    if (browser_widget * result =
-                       (*(SlotType::Proxy)(slot->proxy_))(p1, slot))
+                       (*static_cast<SlotType*>(slot))(p1))
                    {
                        *p0 = result->gobj();
                        return;
@@ -367,15 +367,15 @@ namespace
     void browser_widget_signal_visibility_callback(
        GtkMozEmbed * self, gboolean p0, void * data)
     {
-       typedef SigC::Slot1<void, bool> SlotType;
+       typedef sigc::slot<void, bool> SlotType;
 
        if (Glib::ObjectBase::_get_current_wrapper((GObject *)self))
        {
            try
            {
-               if (SigC::SlotNode * const slot =
+               if (sigc::slot_base * const slot =
                    Glib::SignalProxyNormal::data_to_slot(data))
-                   (*(SlotType::Proxy)(slot->proxy_))(p0, slot);
+                   (*static_cast<SlotType*>(slot))(p0);
            }
            catch(...)
            {
@@ -394,15 +394,15 @@ namespace
     void browser_widget_signal_destroy_browser_callback(
        GtkMozEmbed * self, void * data)
     {
-       typedef SigC::Slot0<void> SlotType;
+       typedef sigc::slot<void> SlotType;
 
        if (Glib::ObjectBase::_get_current_wrapper((GObject *)self))
        {
            try
            {
-               if (SigC::SlotNode * const slot =
+               if (sigc::slot_base * const slot =
                    Glib::SignalProxyNormal::data_to_slot(data))
-                   (*(SlotType::Proxy)(slot->proxy_))(slot);
+                   (*static_cast<SlotType*>(slot))();
            }
            catch(...)
            {
@@ -421,15 +421,15 @@ namespace
     gint browser_widget_signal_open_uri_callback(
        GtkMozEmbed * self, const char * p0, void * data)
     {
-       typedef SigC::Slot1<bool, const char *> SlotType;
+       typedef sigc::slot<bool, const char *> SlotType;
 
        if (Glib::ObjectBase::_get_current_wrapper((GObject *)self))
        {
            try
            {
-               if (SigC::SlotNode * const slot =
+               if (sigc::slot_base * const slot =
                    Glib::SignalProxyNormal::data_to_slot(data))
-                   return (*(SlotType::Proxy)(slot->proxy_))(p0, slot);
+                   return (*static_cast<SlotType*>(slot))(p0);
            }
            catch(...)
            {