summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnders Broman <anders.broman@ericsson.com>2009-07-22 15:23:08 +0000
committerAnders Broman <anders.broman@ericsson.com>2009-07-22 15:23:08 +0000
commit69e79617ef23d30761d722405def5bd61b3bb357 (patch)
tree2c737f5d477c84aff276574cd6cf577e3e0fddcf
parent41b86b26b8c644337e4d49c15857c8678cfbb526 (diff)
downloadwireshark-69e79617ef23d30761d722405def5bd61b3bb357.tar.gz
From Jakub Zawadzki:
This patch fix return value in new_packet_list_find_row_from_data when !select From Me: Change back the cell coloring and remove the horizontal-separator making the colorinjg look the same as in the old packet list. svn path=/trunk/; revision=29168
-rw-r--r--gtk/new_packet_list.c7
-rw-r--r--gtk/packet_list_store.c8
2 files changed, 11 insertions, 4 deletions
diff --git a/gtk/new_packet_list.c b/gtk/new_packet_list.c
index e4a6cb884f..06d1822dc8 100644
--- a/gtk/new_packet_list.c
+++ b/gtk/new_packet_list.c
@@ -130,7 +130,6 @@ create_view_and_model(void)
gtk_tree_view_set_fixed_height_mode(GTK_TREE_VIEW(packetlist->view),
TRUE);
#endif
-
g_signal_connect(packetlist->view, "cursor-changed",
G_CALLBACK(new_packet_list_select_cb), NULL);
@@ -249,8 +248,8 @@ new_packet_list_find_row_from_data(gpointer data, gboolean select)
/* Needed to get the middle and bottom panes updated? */
new_packet_list_select_cb(GTK_TREE_VIEW(packetlist->view),data);
- return row;
}
+ return row;
}
}
@@ -324,8 +323,8 @@ show_cell_data_func(GtkTreeViewColumn *col _U_, GtkCellRenderer *renderer,
"text", cell_text,
"foreground-gdk", &fg_gdk,
"foreground-set", enable_color,
- "cell-background-gdk", &bg_gdk,
- "cell-background-set", enable_color,
+ "background-gdk", &bg_gdk,
+ "background-set", enable_color,
NULL);
}else{
g_object_set(renderer,
diff --git a/gtk/packet_list_store.c b/gtk/packet_list_store.c
index 1b11470f41..58d2d254a0 100644
--- a/gtk/packet_list_store.c
+++ b/gtk/packet_list_store.c
@@ -179,6 +179,14 @@ packet_list_class_init(PacketListClass *klass)
object_class = (GObjectClass*) klass;
object_class->finalize = packet_list_finalize;
+
+ gtk_rc_parse_string (
+ "style \"PacketList-style\"\n"
+ "{\n"
+ " GtkTreeView::horizontal-separator = 0\n"
+ "} widget_class \"*TreeView*\""
+ " style \"PacketList-style\"");
+
}
static void