diff --git a/src/dialogs/colorscheme.c b/src/dialogs/colorscheme.c
index d40c017..b89791d 100644
--- a/src/dialogs/colorscheme.c
+++ b/src/dialogs/colorscheme.c
@@ -60,7 +60,7 @@
  	LAST_SIGNAL
  };
 
- static guint color_signal[LAST_SIGNAL]		= { 0 };
+ static guint signals[LAST_SIGNAL]		= { 0 };
 
  G_DEFINE_TYPE(V3270ColorScheme, V3270ColorScheme, GTK_TYPE_COMBO_BOX);
 
@@ -79,7 +79,7 @@
 	clr = g_value_get_pointer(&value);
 
 	debug("%s=%p",__FUNCTION__,clr);
-	g_signal_emit(widget, color_signal[CHANGED], 0, clr);
+	g_signal_emit(widget, signals[CHANGED], 0, clr);
 
 	g_value_unset(&value);
 
@@ -91,7 +91,7 @@
 
 	klass->parent_class.changed = changed;
 
-	color_signal[CHANGED] =
+	signals[CHANGED] =
 		g_signal_new(
 			I_("update-colors"),
 			G_OBJECT_CLASS_TYPE (gobject_class),
@@ -102,7 +102,7 @@
 			G_TYPE_NONE, 1, G_TYPE_POINTER, 0
 		);
 
-	debug("changed_signal=%d",(int) color_signal[CHANGED]);
+	debug("changed_signal=%d",(int) signals[CHANGED]);
 
  }
 
@@ -268,7 +268,7 @@
 		g_message("Unable to load color schemes in \"%s\"",filename);
 #else
 		g_warning("Unable to load color schemes in \"%s\"",filename);
-#endif 		
+#endif
 		gtk_widget_set_sensitive(widget,FALSE);
 		return widget;
 	}
diff --git a/src/filetransfer/activitylist.c b/src/filetransfer/activitylist.c
index 538d89c..f1d2ecd 100644
--- a/src/filetransfer/activitylist.c
+++ b/src/filetransfer/activitylist.c
@@ -66,7 +66,7 @@
 
  G_DEFINE_TYPE(V3270FTActivityList, V3270FTActivityList, GTK_TYPE_TREE_VIEW);
 
- static guint v3270_activity_list_signals[V3270_ACTIVITY_LIST_LAST_SIGNAL] = { 0 };
+ static guint signals[V3270_ACTIVITY_LIST_LAST_SIGNAL] = { 0 };
 
 /*--[ Implement ]------------------------------------------------------------------------------------*/
 
@@ -121,7 +121,7 @@
 		if(activity)
 		{
 			debug("%s: activity is %p",__FUNCTION__,activity);
-			g_signal_emit(view, v3270_activity_list_signals[V3270_ACTIVITY_LIST_SELECTED_SIGNAL], 0, activity);
+			g_signal_emit(view, signals[V3270_ACTIVITY_LIST_SELECTED_SIGNAL], 0, activity);
 		}
 
 	}
@@ -138,7 +138,7 @@
 
 	klass->signal.has_file = V3270FTActivityList_has_file;
 
-	v3270_activity_list_signals[V3270_ACTIVITY_LIST_HAS_FILE_SIGNAL] =
+	signals[V3270_ACTIVITY_LIST_HAS_FILE_SIGNAL] =
 		g_signal_new(	I_("has-file"),
 						G_OBJECT_CLASS_TYPE (gobject_class),
 						G_SIGNAL_RUN_FIRST,
@@ -147,7 +147,7 @@
 						v3270ft_VOID__VOID_BOOLEAN,
 						G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
 
-	v3270_activity_list_signals[V3270_ACTIVITY_LIST_SELECTED_SIGNAL] =
+	signals[V3270_ACTIVITY_LIST_SELECTED_SIGNAL] =
 		g_signal_new(	I_("changed"),
 						G_OBJECT_CLASS_TYPE (gobject_class),
 						G_SIGNAL_RUN_FIRST,
@@ -286,7 +286,7 @@
 	{
 		debug("%s: Selecting inserted activity",__FUNCTION__);
 		gtk_tree_selection_select_iter(gtk_tree_view_get_selection(GTK_TREE_VIEW(widget)),&iter);
-		g_signal_emit(widget, v3270_activity_list_signals[V3270_ACTIVITY_LIST_SELECTED_SIGNAL], 0, activity);
+		g_signal_emit(widget, signals[V3270_ACTIVITY_LIST_SELECTED_SIGNAL], 0, activity);
 	}
 
  }
@@ -391,7 +391,7 @@
 
 	reload(widget);
 
-	g_signal_emit(widget, v3270_activity_list_signals[V3270_ACTIVITY_LIST_HAS_FILE_SIGNAL], 0, (list->filename == NULL ? FALSE : TRUE));
+	g_signal_emit(widget, signals[V3270_ACTIVITY_LIST_HAS_FILE_SIGNAL], 0, (list->filename == NULL ? FALSE : TRUE));
 
 
  }
@@ -460,7 +460,7 @@
 		v3270_activity_list_save(widget);
 	}
 
-	g_signal_emit(widget, v3270_activity_list_signals[V3270_ACTIVITY_LIST_HAS_FILE_SIGNAL], 0, (list->filename == NULL ? FALSE : TRUE));
+	g_signal_emit(widget, signals[V3270_ACTIVITY_LIST_HAS_FILE_SIGNAL], 0, (list->filename == NULL ? FALSE : TRUE));
 
  }
 
diff --git a/src/filetransfer/private.h b/src/filetransfer/private.h
index 1a2b01e..e0a6a02 100644
--- a/src/filetransfer/private.h
+++ b/src/filetransfer/private.h
@@ -198,8 +198,6 @@
 
 	};
 
-	G_GNUC_INTERNAL guint	  v3270ftprogress_signal[V3270FTPROGRESS_SIGNAL_COUNT];
-
 
 	G_GNUC_INTERNAL void	  v3270ft_update_actions(v3270ft *dialog);
 	G_GNUC_INTERNAL void	  v3270ft_update_state(struct v3270ft_entry *entry);
@@ -216,6 +214,7 @@
 	G_GNUC_INTERNAL struct v3270ft_entry * v3270ft_get_selected(v3270ft *dialog);
 	G_GNUC_INTERNAL struct v3270ft_entry * v3270ft_create_entry(void);
 
+	G_GNUC_INTERNAL void v3270ftprogress_signal_emit(gpointer instance, enum V3270FTPROGRESS_SIGNAL signal_id, ...);
 
 
 #endif // PRIVATE_H_INCLUDED
diff --git a/src/filetransfer/settings.c b/src/filetransfer/settings.c
index dcab4d4..f5f0321 100644
--- a/src/filetransfer/settings.c
+++ b/src/filetransfer/settings.c
@@ -95,7 +95,7 @@
  	V3270_FT_SETTINGS_LAST_SIGNAL
  };
 
- static guint v3270_ft_settings_signals[V3270_FT_SETTINGS_LAST_SIGNAL] = { 0 };
+ static guint signals[V3270_FT_SETTINGS_LAST_SIGNAL] = { 0 };
 
 /*--[ Implement ]------------------------------------------------------------------------------------*/
 
@@ -116,7 +116,7 @@ static void V3270FTSettings_has_activity(GtkWidget G_GNUC_UNUSED(*widget), gbool
 	klass->signal.validity = V3270FTSettings_validity;
 	klass->signal.has_activity = V3270FTSettings_has_activity;
 
-	v3270_ft_settings_signals[V3270_FT_SETTINGS_VALIDITY_SIGNAL] =
+	signals[V3270_FT_SETTINGS_VALIDITY_SIGNAL] =
 		g_signal_new(	I_("validity"),
 						G_OBJECT_CLASS_TYPE (gobject_class),
 						G_SIGNAL_RUN_FIRST,
@@ -126,7 +126,7 @@ static void V3270FTSettings_has_activity(GtkWidget G_GNUC_UNUSED(*widget), gbool
 						G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
 
 
-	v3270_ft_settings_signals[V3270_FT_SETTINGS_HAS_ACTIVITY_SIGNAL] =
+	signals[V3270_FT_SETTINGS_HAS_ACTIVITY_SIGNAL] =
 		g_signal_new(	I_("has-activity"),
 						G_OBJECT_CLASS_TYPE (gobject_class),
 						G_SIGNAL_RUN_FIRST,
@@ -272,7 +272,7 @@ static void open_select_file_dialog(GtkEntry *entry, G_GNUC_UNUSED GtkEntryIconP
 	widget->transfer.is_valid = is_valid;
 
 	debug("Transfer is now \"%s\"", is_valid ? "valid" : "invalid");
-	g_signal_emit(widget, v3270_ft_settings_signals[V3270_FT_SETTINGS_VALIDITY_SIGNAL], 0, widget->transfer.is_valid);
+	g_signal_emit(widget, signals[V3270_FT_SETTINGS_VALIDITY_SIGNAL], 0, widget->transfer.is_valid);
 
  }
 
@@ -607,7 +607,7 @@ static void open_select_file_dialog(GtkEntry *entry, G_GNUC_UNUSED GtkEntryIconP
  {
  	GTK_V3270_FT_SETTINGS(widget)->activity = activity;
  	v3270_ft_settings_reset(widget);
-	g_signal_emit(widget, v3270_ft_settings_signals[V3270_FT_SETTINGS_HAS_ACTIVITY_SIGNAL], 0, (activity == NULL ? FALSE : TRUE));
+	g_signal_emit(widget, signals[V3270_FT_SETTINGS_HAS_ACTIVITY_SIGNAL], 0, (activity == NULL ? FALSE : TRUE));
  }
 
  LIB3270_EXPORT GObject * v3270_ft_settings_get_activity(GtkWidget *widget)
diff --git a/src/filetransfer/v3270ftprogress.c b/src/filetransfer/v3270ftprogress.c
index a7a84bc..72d0830 100644
--- a/src/filetransfer/v3270ftprogress.c
+++ b/src/filetransfer/v3270ftprogress.c
@@ -47,7 +47,7 @@
 
 /*--[ Globals ]--------------------------------------------------------------------------------------*/
 
-guint v3270ftprogress_signal[V3270FTPROGRESS_SIGNAL_COUNT] = { 0 };
+static guint signals[V3270FTPROGRESS_SIGNAL_COUNT] = { 0 };
 
 // http://www3.rocketsoftware.com/bluezone/help/v42/en/bz/DISPLAY/IND$FILE/IND$FILE_Technical_Reference.htm
 
@@ -316,7 +316,7 @@ static void v3270ftprogress_class_init(v3270ftprogressClass *klass) {
 	dialog_class->response	= dialog_response;
 	dialog_class->close		= dialog_close;
 
-	v3270ftprogress_signal[V3270FTPROGRESS_SIGNAL_SUCCESS] =
+	signals[V3270FTPROGRESS_SIGNAL_SUCCESS] =
 		g_signal_new(	I_("success"),
 						G_OBJECT_CLASS_TYPE (gobject_class),
 						G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
@@ -325,7 +325,7 @@ static void v3270ftprogress_class_init(v3270ftprogressClass *klass) {
 						v3270ft_VOID__POINTER_POINTER,
 						G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_POINTER);
 
-	v3270ftprogress_signal[V3270FTPROGRESS_SIGNAL_FAILED] =
+	signals[V3270FTPROGRESS_SIGNAL_FAILED] =
 		g_signal_new(	I_("failed"),
 						G_OBJECT_CLASS_TYPE (gobject_class),
 						G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
@@ -544,7 +544,7 @@ gboolean send_delayed_signal(struct delayed_signal *sig) {
 	lib3270_ft_destroy(sig->hSession,NULL);
 
 	if(userdata) {
-		g_signal_emit(GTK_WIDGET(userdata),v3270ftprogress_signal[sig->signal], 0, sig->msg, sig->text);
+		v3270ftprogress_signal_emit(GTK_WIDGET(userdata),sig->signal, sig->msg, sig->text);
 	}
 
 	return FALSE;
@@ -718,7 +718,7 @@ static gboolean do_timer(v3270ftprogress *dialog) {
 			lib3270_ft_destroy(dialog->session,NULL);
 		}
 
-		g_signal_emit(GTK_WIDGET(dialog),v3270ftprogress_signal[V3270FTPROGRESS_SIGNAL_FAILED], 0, _( "Transfer failed" ), strerror(ETIMEDOUT));
+		v3270ftprogress_signal_emit(GTK_WIDGET(dialog),V3270FTPROGRESS_SIGNAL_FAILED, _( "Transfer failed" ), strerror(ETIMEDOUT));
 	}
 
 	return TRUE;
@@ -753,11 +753,11 @@ void v3270ftprogress_start_transfer(GtkWidget *widget) {
 
         if(message && *message) {
 
-			g_signal_emit(GTK_WIDGET(widget),v3270ftprogress_signal[V3270FTPROGRESS_SIGNAL_FAILED], 0, message, NULL);
+			v3270ftprogress_signal_emit(GTK_WIDGET(widget),V3270FTPROGRESS_SIGNAL_FAILED, message, NULL);
 
         } else {
 
-			g_signal_emit(GTK_WIDGET(widget),v3270ftprogress_signal[V3270FTPROGRESS_SIGNAL_FAILED], 0, _( "Can't start file transfer session" ), NULL);
+			v3270ftprogress_signal_emit(GTK_WIDGET(widget),V3270FTPROGRESS_SIGNAL_FAILED, _( "Can't start file transfer session" ), NULL);
 
         }
 
@@ -770,7 +770,7 @@ void v3270ftprogress_start_transfer(GtkWidget *widget) {
 	if(!cbk) {
 
 		lib3270_ft_destroy(dialog->session,NULL);
-		g_signal_emit(GTK_WIDGET(widget),v3270ftprogress_signal[V3270FTPROGRESS_SIGNAL_FAILED], 0, _( "Can't set callback table" ), NULL);
+		v3270ftprogress_signal_emit(GTK_WIDGET(widget),V3270FTPROGRESS_SIGNAL_FAILED, _( "Can't set callback table" ), NULL);
 
 		return;
 	}
@@ -802,3 +802,13 @@ void v3270ftprogress_start_transfer(GtkWidget *widget) {
 	lib3270_ft_start(dialog->session);
 
 }
+
+void v3270ftprogress_signal_emit(gpointer instance, enum V3270FTPROGRESS_SIGNAL signal_id, ...)
+{
+  va_list var_args;
+
+  va_start (var_args, signal_id);
+  g_signal_emit_valist(instance, signals[signal_id], 0, var_args);
+  va_end (var_args);
+
+}
diff --git a/src/filetransfer/worker.c b/src/filetransfer/worker.c
index 2ff7c4a..5a502be 100644
--- a/src/filetransfer/worker.c
+++ b/src/filetransfer/worker.c
@@ -76,7 +76,7 @@
 
  G_DEFINE_TYPE(V3270FTWorker, V3270FTWorker, GTK_TYPE_GRID);
 
- static guint v3270_worker_signals[V3270_WORKER_LAST_SIGNAL] = { 0 };
+ static guint signals[V3270_WORKER_LAST_SIGNAL] = { 0 };
 
 /*--[ Implement ]------------------------------------------------------------------------------------*/
 
@@ -143,7 +143,7 @@
 
 	gobject_class->finalize = finalize;
 
-	v3270_worker_signals[V3270_WORKER_ACTIVITY_SIGNAL] =
+	signals[V3270_WORKER_ACTIVITY_SIGNAL] =
 		g_signal_new(
 			I_("activity"),
 			G_OBJECT_CLASS_TYPE (gobject_class),
@@ -154,7 +154,7 @@
 			G_TYPE_NONE, 1, G_TYPE_OBJECT
 		);
 
- 	v3270_worker_signals[V3270_WORKER_TRANSFER_FAILED_SIGNAL] =
+ 	signals[V3270_WORKER_TRANSFER_FAILED_SIGNAL] =
 		g_signal_new(
 			I_("failed"),
 			G_OBJECT_CLASS_TYPE (gobject_class),
@@ -165,7 +165,7 @@
 			G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_POINTER
 	);
 
- 	v3270_worker_signals[V3270_WORKER_TRANSFER_SUCCESS_SIGNAL] =
+ 	signals[V3270_WORKER_TRANSFER_SUCCESS_SIGNAL] =
 		g_signal_new(
 			I_("success"),
 			G_OBJECT_CLASS_TYPE (gobject_class),
@@ -176,7 +176,7 @@
 			G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_POINTER
 	);
 
- 	v3270_worker_signals[V3270_WORKER_TRANSFER_STATE_SIGNAL] =
+ 	signals[V3270_WORKER_TRANSFER_STATE_SIGNAL] =
 		g_signal_new(
 			I_("ft-state-changed"),
 			G_OBJECT_CLASS_TYPE (gobject_class),
@@ -328,7 +328,7 @@
 		gtk_entry_set_text(worker->field[ix],"");
 	}
 
-	g_signal_emit(widget, v3270_worker_signals[V3270_WORKER_ACTIVITY_SIGNAL], 0, worker->activity);
+	g_signal_emit(widget, signals[V3270_WORKER_ACTIVITY_SIGNAL], 0, worker->activity);
 
  }
 
@@ -381,7 +381,7 @@
 
 	g_signal_emit(
 		GTK_WIDGET(cfg->worker),
-		v3270_worker_signals[cfg->signal],
+		signals[cfg->signal],
 		0,
 		cfg->msg,
 		description
@@ -522,7 +522,7 @@
 
  static gboolean bg_emit_state_changed(struct bg_state_changed * cfg)
  {
-	g_signal_emit(cfg->worker, v3270_worker_signals[V3270_WORKER_TRANSFER_STATE_SIGNAL], 0, (guint) cfg->st, cfg->msg);
+	g_signal_emit(cfg->worker, signals[V3270_WORKER_TRANSFER_STATE_SIGNAL], 0, (guint) cfg->st, cfg->msg);
 	return FALSE;
  }
 
@@ -563,7 +563,7 @@ static gboolean do_timer(V3270FTWorker *worker) {
 
 			g_signal_emit(
 				GTK_WIDGET(worker),
-				v3270_worker_signals[V3270_WORKER_TRANSFER_FAILED_SIGNAL],
+				signals[V3270_WORKER_TRANSFER_FAILED_SIGNAL],
 				0,
 				_( "Transfer failed" ),
 				message
@@ -595,7 +595,7 @@ static gboolean do_timer(V3270FTWorker *worker) {
 		pulse_stop(worker);
 
 		// Emit "transfer failed"
-		g_signal_emit(GTK_WIDGET(widget),v3270_worker_signals[V3270_WORKER_TRANSFER_FAILED_SIGNAL], 0, message, NULL);
+		g_signal_emit(GTK_WIDGET(widget),signals[V3270_WORKER_TRANSFER_FAILED_SIGNAL], 0, message, NULL);
 
 		// Emit "no transfer"
 		ft_state_changed(worker->hSession, LIB3270_FT_STATE_NONE, _("No transfer in progress"), widget);
@@ -616,7 +616,7 @@ static gboolean do_timer(V3270FTWorker *worker) {
 
 		g_signal_emit(
 			GTK_WIDGET(widget),
-			v3270_worker_signals[V3270_WORKER_TRANSFER_FAILED_SIGNAL],
+			signals[V3270_WORKER_TRANSFER_FAILED_SIGNAL],
 			0,
 			message,
 			_("The callback table for file transfer was rejected, possible version mismatch on lib3270")
--
libgit2 0.21.2