Avoid double space in filter when creating from conversations and endpoints.

svn path=/trunk/; revision=24299

2 files changed, 10 insertions, 10 deletions

diff --git a/gtk/conversations_table.c b/gtk/conversations_table.c
index eda2934077..f3986eb093 100644
--- a/gtk/conversations_table.c
+++ b/gtk/conversations_table.c
@@ -522,7 +522,7 @@ ct_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data, guint callbac
 	switch(direction){
 	case DIR_A_TO_FROM_B:
 		/* A <-> B */
-		g_snprintf(dirstr, 127, "%s==%s %s%s%s%s && %s==%s %s%s%s%s",
+		g_snprintf(dirstr, 127, "%s==%s%s%s%s%s && %s==%s%s%s%s%s",
 			ct_get_filter_name(&ct->conversations[selection].src_address, ct->conversations[selection].sat, ct->conversations[selection].port_type,  FN_ANY_ADDRESS),
 			address_to_str(&ct->conversations[selection].src_address),
 			sport?" && ":"",
@@ -539,7 +539,7 @@ ct_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data, guint callbac
 		break;
 	case DIR_A_TO_B:
 		/* A --> B */
-		g_snprintf(dirstr, 127, "%s==%s %s%s%s%s && %s==%s %s%s%s%s",
+		g_snprintf(dirstr, 127, "%s==%s%s%s%s%s && %s==%s%s%s%s%s",
 			ct_get_filter_name(&ct->conversations[selection].src_address, ct->conversations[selection].sat, ct->conversations[selection].port_type,  FN_SRC_ADDRESS),
 			address_to_str(&ct->conversations[selection].src_address),
 			sport?" && ":"",
@@ -556,7 +556,7 @@ ct_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data, guint callbac
 		break;
 	case DIR_A_FROM_B:
 		/* A <-- B */
-		g_snprintf(dirstr, 127, "%s==%s %s%s%s%s && %s==%s %s%s%s%s",
+		g_snprintf(dirstr, 127, "%s==%s%s%s%s%s && %s==%s%s%s%s%s",
 			ct_get_filter_name(&ct->conversations[selection].src_address, ct->conversations[selection].sat, ct->conversations[selection].port_type,  FN_DST_ADDRESS),
 			address_to_str(&ct->conversations[selection].src_address),
 			sport?" && ":"",
@@ -573,7 +573,7 @@ ct_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data, guint callbac
 		break;
 	case DIR_A_TO_FROM_ANY:
 		/* A <-> ANY */
-		g_snprintf(dirstr, 127, "%s==%s %s%s%s%s",
+		g_snprintf(dirstr, 127, "%s==%s%s%s%s%s",
 			ct_get_filter_name(&ct->conversations[selection].src_address, ct->conversations[selection].sat, ct->conversations[selection].port_type,  FN_ANY_ADDRESS),
 			address_to_str(&ct->conversations[selection].src_address),
 			sport?" && ":"",
@@ -584,7 +584,7 @@ ct_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data, guint callbac
 		break;
 	case DIR_A_TO_ANY:
 		/* A --> ANY */
-		g_snprintf(dirstr, 127, "%s==%s %s%s%s%s",
+		g_snprintf(dirstr, 127, "%s==%s%s%s%s%s",
 			ct_get_filter_name(&ct->conversations[selection].src_address, ct->conversations[selection].sat, ct->conversations[selection].port_type,  FN_SRC_ADDRESS),
 			address_to_str(&ct->conversations[selection].src_address),
 			sport?" && ":"",
@@ -595,7 +595,7 @@ ct_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data, guint callbac
 		break;
 	case DIR_A_FROM_ANY:
 		/* A <-- ANY */
-		g_snprintf(dirstr, 127, "%s==%s %s%s%s%s",
+		g_snprintf(dirstr, 127, "%s==%s%s%s%s%s",
 			ct_get_filter_name(&ct->conversations[selection].src_address, ct->conversations[selection].sat, ct->conversations[selection].port_type,  FN_DST_ADDRESS),
 			address_to_str(&ct->conversations[selection].src_address),
 			sport?" && ":"",
@@ -606,7 +606,7 @@ ct_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data, guint callbac
 		break;
 	case DIR_ANY_TO_FROM_B:
 		/* ANY <-> B */
-		g_snprintf(dirstr, 127, "%s==%s %s%s%s%s",
+		g_snprintf(dirstr, 127, "%s==%s%s%s%s%s",
 			ct_get_filter_name(&ct->conversations[selection].dst_address, ct->conversations[selection].sat, ct->conversations[selection].port_type,  FN_ANY_ADDRESS),
 			address_to_str(&ct->conversations[selection].dst_address),
 			dport?" && ":"",
@@ -617,7 +617,7 @@ ct_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data, guint callbac
 		break;
 	case DIR_ANY_FROM_B:
 		/* ANY <-- B */
-		g_snprintf(dirstr, 127, "%s==%s %s%s%s%s",
+		g_snprintf(dirstr, 127, "%s==%s%s%s%s%s",
 			ct_get_filter_name(&ct->conversations[selection].dst_address, ct->conversations[selection].sat, ct->conversations[selection].port_type,  FN_SRC_ADDRESS),
 			address_to_str(&ct->conversations[selection].dst_address),
 			dport?" && ":"",
@@ -628,7 +628,7 @@ ct_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data, guint callbac
 		break;
 	case DIR_ANY_TO_B:
 		/* ANY --> B */
-		g_snprintf(dirstr, 127, "%s==%s %s%s%s%s",
+		g_snprintf(dirstr, 127, "%s==%s%s%s%s%s",
 			ct_get_filter_name(&ct->conversations[selection].dst_address, ct->conversations[selection].sat, ct->conversations[selection].port_type,  FN_DST_ADDRESS),
 			address_to_str(&ct->conversations[selection].dst_address),
 			dport?" && ":"",
diff --git a/gtk/hostlist_table.c b/gtk/hostlist_table.c
index c077c9a2db..d772b114af 100644
--- a/gtk/hostlist_table.c
+++ b/gtk/hostlist_table.c
@@ -339,7 +339,7 @@ hostlist_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data, guint c
 
 	sport=hostlist_port_to_str(hl->hosts[selection].port_type, hl->hosts[selection].port);
 
-	g_snprintf(dirstr, 127, "%s==%s %s%s%s%s",
+	g_snprintf(dirstr, 127, "%s==%s%s%s%s%s",
 		hostlist_get_filter_name(&hl->hosts[selection].address,
 		hl->hosts[selection].sat, hl->hosts[selection].port_type,  FN_ANY_ADDRESS),
 		address_to_str(&hl->hosts[selection].address),