[gnome-commander] Replacing obsoleted gtk_signal_new() with g_signal_new()



commit 86ad5f525411db1bb729e5c2b09b1e575b57012c
Author: Piotr Eljasiak <epiotr src gnome org>
Date:   Fri Aug 13 21:26:09 2010 +0200

    Replacing obsoleted gtk_signal_new() with g_signal_new()

 src/gnome-cmd-dir.cc |  104 ++++++++++++++++++++++++++-----------------------
 1 files changed, 55 insertions(+), 49 deletions(-)
---
diff --git a/src/gnome-cmd-dir.cc b/src/gnome-cmd-dir.cc
index 3fce77c..6446316 100644
--- a/src/gnome-cmd-dir.cc
+++ b/src/gnome-cmd-dir.cc
@@ -144,58 +144,64 @@ static void class_init (GnomeCmdDirClass *klass)
     parent_class = (GnomeCmdFileClass *) gtk_type_class (gnome_cmd_file_get_type ());
 
     signals[FILE_CREATED] =
-        gtk_signal_new ("file-created",
-            GTK_RUN_LAST,
-            G_OBJECT_CLASS_TYPE (object_class),
-            GTK_SIGNAL_OFFSET (GnomeCmdDirClass, file_created),
-            gtk_marshal_NONE__POINTER,
-            GTK_TYPE_NONE,
-            1, GTK_TYPE_POINTER);
+        g_signal_new ("file-created",
+            G_TYPE_FROM_CLASS (klass),
+            G_SIGNAL_RUN_LAST,
+            G_STRUCT_OFFSET (GnomeCmdDirClass, file_created),
+            NULL, NULL,
+            g_cclosure_marshal_VOID__POINTER,
+            G_TYPE_NONE,
+            1, G_TYPE_POINTER);
 
     signals[FILE_DELETED] =
-        gtk_signal_new ("file-deleted",
-            GTK_RUN_LAST,
-            G_OBJECT_CLASS_TYPE (object_class),
-            GTK_SIGNAL_OFFSET (GnomeCmdDirClass, file_deleted),
-            gtk_marshal_NONE__POINTER,
-            GTK_TYPE_NONE,
-            1, GTK_TYPE_POINTER);
+        g_signal_new ("file-deleted",
+            G_TYPE_FROM_CLASS (klass),
+            G_SIGNAL_RUN_LAST,
+            G_STRUCT_OFFSET (GnomeCmdDirClass, file_deleted),
+            NULL, NULL,
+            g_cclosure_marshal_VOID__POINTER,
+            G_TYPE_NONE,
+            1, G_TYPE_POINTER);
 
     signals[FILE_CHANGED] =
-        gtk_signal_new ("file-changed",
-            GTK_RUN_LAST,
-            G_OBJECT_CLASS_TYPE (object_class),
-            GTK_SIGNAL_OFFSET (GnomeCmdDirClass, file_changed),
-            gtk_marshal_NONE__POINTER,
-            GTK_TYPE_NONE,
-            1, GTK_TYPE_POINTER);
+        g_signal_new ("file-changed",
+            G_TYPE_FROM_CLASS (klass),
+            G_SIGNAL_RUN_LAST,
+            G_STRUCT_OFFSET (GnomeCmdDirClass, file_changed),
+            NULL, NULL,
+            g_cclosure_marshal_VOID__POINTER,
+            G_TYPE_NONE,
+            1, G_TYPE_POINTER);
 
     signals[FILE_RENAMED] =
-        gtk_signal_new ("file-renamed",
-            GTK_RUN_LAST,
-            G_OBJECT_CLASS_TYPE (object_class),
-            GTK_SIGNAL_OFFSET (GnomeCmdDirClass, file_renamed),
-            gtk_marshal_NONE__POINTER,
-            GTK_TYPE_NONE,
-            1, GTK_TYPE_POINTER);
+        g_signal_new ("file-renamed",
+            G_TYPE_FROM_CLASS (klass),
+            G_SIGNAL_RUN_LAST,
+            G_STRUCT_OFFSET (GnomeCmdDirClass, file_renamed),
+            NULL, NULL,
+            g_cclosure_marshal_VOID__POINTER,
+            G_TYPE_NONE,
+            1, G_TYPE_POINTER);
 
     signals[LIST_OK] =
-        gtk_signal_new ("list-ok",
-            GTK_RUN_LAST,
-            G_OBJECT_CLASS_TYPE (object_class),
-            GTK_SIGNAL_OFFSET (GnomeCmdDirClass, list_ok),
-            gtk_marshal_NONE__POINTER,
-            GTK_TYPE_NONE,
-            1, GTK_TYPE_POINTER);
+        g_signal_new ("list-ok",
+            G_TYPE_FROM_CLASS (klass),
+            G_SIGNAL_RUN_LAST,
+            G_STRUCT_OFFSET (GnomeCmdDirClass, list_ok),
+            NULL, NULL,
+            g_cclosure_marshal_VOID__POINTER,
+            G_TYPE_NONE,
+            1, G_TYPE_POINTER);
 
     signals[LIST_FAILED] =
-        gtk_signal_new ("list-failed",
-            GTK_RUN_LAST,
-            G_OBJECT_CLASS_TYPE (object_class),
-            GTK_SIGNAL_OFFSET (GnomeCmdDirClass, list_failed),
-            gtk_marshal_NONE__INT,
-            GTK_TYPE_NONE,
-            1, GTK_TYPE_INT);
+        g_signal_new ("list-failed",
+            G_TYPE_FROM_CLASS (klass),
+            G_SIGNAL_RUN_LAST,
+            G_STRUCT_OFFSET (GnomeCmdDirClass, list_failed),
+            NULL, NULL,
+            g_cclosure_marshal_VOID__INT,
+            G_TYPE_NONE,
+            1, G_TYPE_INT);
 
     object_class->destroy = destroy;
     klass->file_created = NULL;
@@ -492,7 +498,7 @@ static void on_list_done (GnomeCmdDir *dir, GList *infolist, GnomeVFSResult resu
         dir->priv->last_result = GNOME_VFS_OK;
 
         DEBUG('l', "Emitting 'list-ok' signal\n");
-        gtk_signal_emit (GTK_OBJECT (dir), signals[LIST_OK], dir->priv->files);
+        g_signal_emit (dir, signals[LIST_OK], 0, dir->priv->files);
     }
     else if (dir->state == DIR_STATE_EMPTY)
     {
@@ -508,7 +514,7 @@ static void on_list_done (GnomeCmdDir *dir, GList *infolist, GnomeVFSResult resu
         dir->priv->lock = FALSE;
 
         DEBUG('l', "Emitting 'list-failed' signal\n");
-        gtk_signal_emit (GTK_OBJECT (dir), signals[LIST_FAILED], result);
+        g_signal_emit (dir, signals[LIST_FAILED], 0, result);
     }
 }
 
@@ -584,7 +590,7 @@ void gnome_cmd_dir_list_files (GnomeCmdDir *dir, gboolean visprog)
         gnome_cmd_dir_relist_files (dir, visprog);
     }
     else
-        gtk_signal_emit (GTK_OBJECT (dir), signals[LIST_OK], dir->priv->files);
+        g_signal_emit (dir, signals[LIST_OK], 0, dir->priv->files);
 }
 
 
@@ -748,7 +754,7 @@ void gnome_cmd_dir_file_created (GnomeCmdDir *dir, const gchar *uri_str)
 
     dir->priv->needs_mtime_update = TRUE;
 
-    gtk_signal_emit (GTK_OBJECT (dir), signals[FILE_CREATED], f);
+    g_signal_emit (dir, signals[FILE_CREATED], 0, f);
 }
 
 
@@ -765,7 +771,7 @@ void gnome_cmd_dir_file_deleted (GnomeCmdDir *dir, const gchar *uri_str)
 
     dir->priv->needs_mtime_update = TRUE;
 
-    gtk_signal_emit (GTK_OBJECT (dir), signals[FILE_DELETED], f);
+    g_signal_emit (dir, signals[FILE_DELETED], 0, f);
 
     dir->priv->file_collection->remove(uri_str);
     dir->priv->files = dir->priv->file_collection->get_list();
@@ -791,7 +797,7 @@ void gnome_cmd_dir_file_changed (GnomeCmdDir *dir, const gchar *uri_str)
 
     f->update_info(info);
     gnome_cmd_file_invalidate_metadata (f);
-    gtk_signal_emit (GTK_OBJECT (dir), signals[FILE_CHANGED], f);
+    g_signal_emit (dir, signals[FILE_CHANGED], 0, f);
 }
 
 
@@ -808,7 +814,7 @@ void gnome_cmd_dir_file_renamed (GnomeCmdDir *dir, GnomeCmdFile *f, const gchar
 
     dir->priv->file_collection->remove(old_uri_str);
     dir->priv->file_collection->add(f);
-    gtk_signal_emit (GTK_OBJECT (dir), signals[FILE_RENAMED], f);
+    g_signal_emit (dir, signals[FILE_RENAMED], 0, f);
 }
 
 



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