[Gpa-commits] r879 - trunk/src

[scm-commit@wald.intevation.org]

Author: marcus
Date: 2008-05-02 15:05:26 +0200 (Fri, 02 May 2008)
New Revision: 879

Modified:
   trunk/src/ChangeLog
   trunk/src/gpaoperation.c
Log:
2008-05-02  Marcus Brinkmann  <marcus at g10code.de>

	* gpaoperation.c (gpa_operation_write_status): Fix signal emittance.
	(gpa_operation_class_init): Fix signature of signal STATUS.


Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog	2008-04-28 19:29:05 UTC (rev 878)
+++ trunk/src/ChangeLog	2008-05-02 13:05:26 UTC (rev 879)
@@ -1,3 +1,8 @@
+2008-05-02  Marcus Brinkmann  <marcus at g10code.de>
+
+	* gpaoperation.c (gpa_operation_write_status): Fix signal emittance.
+	(gpa_operation_class_init): Fix signature of signal STATUS.
+
 2008-04-28  Werner Koch  <wk at g10code.com>
 
 	* settingsdlg.c (gpa_settings_dialog_new): Put advanced UI

Modified: trunk/src/gpaoperation.c
===================================================================
--- trunk/src/gpaoperation.c	2008-04-28 19:29:05 UTC (rev 878)
+++ trunk/src/gpaoperation.c	2008-05-02 13:05:26 UTC (rev 879)
@@ -153,10 +153,10 @@
     g_signal_new ("status",
 		  G_TYPE_FROM_CLASS (object_class),
 		  G_SIGNAL_RUN_LAST | G_SIGNAL_NO_RECURSE | G_SIGNAL_NO_HOOKS,
-		  G_STRUCT_OFFSET (GpaOperationClass, completed),
+		  G_STRUCT_OFFSET (GpaOperationClass, status),
 		  NULL, NULL,
 		  gpa_marshal_INT__STRING_STRING,
-		  G_TYPE_INT, 1, G_TYPE_STRING, 1, G_TYPE_STRING);
+		  G_TYPE_INT, 2, G_TYPE_STRING, G_TYPE_STRING);
 
 
   /* Properties.  */
@@ -241,9 +241,10 @@
     }
   *p = 0;
 
-  /* FIXME: Get return value.  Might require an allocator to not only
-     get the last one.  */
-  g_signal_emit_by_name (GPA_OPERATION (op), "status", buf);
+  /* FIXME: Return value might require an allocator to not only get
+     the last one.  */
+  g_signal_emit (GPA_OPERATION (op), signals[STATUS], NULL,
+		 statusname, buf, &err);
   
   va_end (arg_ptr);