diff options
| author | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2013-06-26 22:03:57 +0000 |
|---|---|---|
| committer | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2013-06-26 22:03:57 +0000 |
| commit | 97d59088b014bbc27e2f0b4254e4f1a9816dd7a5 (patch) | |
| tree | bb3e2ec081689dab7b1d1f83ba561bb3af4809c5 /ui/gtk/packet_list.c | |
| parent | 53bc39d6edd632684b37cf895d00e122df9cf4c2 (diff) | |
#gtk #packet-list simplify, use gtk_tree_view_column_add_attribute() for text attribute.
svn path=/trunk/; revision=50176
Diffstat (limited to 'ui/gtk/packet_list.c')
| -rw-r--r-- | ui/gtk/packet_list.c | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/ui/gtk/packet_list.c b/ui/gtk/packet_list.c index 9bf5e5b459..b263485cb3 100644 --- a/ui/gtk/packet_list.c +++ b/ui/gtk/packet_list.c @@ -772,6 +772,7 @@ create_view_and_model(void) g_object_set(renderer, "ypad", 0, NULL); + gtk_tree_view_column_add_attribute(col, renderer, "text", i); gtk_tree_view_column_set_cell_data_func(col, renderer, show_cell_data_func, GINT_TO_POINTER(i), @@ -1315,24 +1316,14 @@ packet_list_get_row_data(gint row) static void show_cell_data_func(GtkTreeViewColumn *col _U_, GtkCellRenderer *renderer, - GtkTreeModel *model, GtkTreeIter *iter, gpointer data) + GtkTreeModel *model, GtkTreeIter *iter, gpointer data _U_) { - guint col_num = GPOINTER_TO_INT(data); - frame_data *fdata; - gchar *cell_text; + frame_data *fdata = packet_list_get_record(model, iter); gboolean color_on; GdkColor fg_gdk; GdkColor bg_gdk; - gtk_tree_model_get(model, iter, - col_num, &cell_text, - /* The last column is reserved for frame_data */ - gtk_tree_model_get_n_columns(model)-1, &fdata, - -1); - - g_assert(cell_text); - if (fdata->flags.ignored) { color_t_to_gdkcolor(&fg_gdk, &prefs.gui_ignored_fg); color_t_to_gdkcolor(&bg_gdk, &prefs.gui_ignored_bg); @@ -1352,7 +1343,6 @@ show_cell_data_func(GtkTreeViewColumn *col _U_, GtkCellRenderer *renderer, if (color_on) { g_object_set(renderer, - "text", cell_text, "foreground-gdk", &fg_gdk, "foreground-set", TRUE, "background-gdk", &bg_gdk, @@ -1360,12 +1350,10 @@ show_cell_data_func(GtkTreeViewColumn *col _U_, GtkCellRenderer *renderer, NULL); } else { g_object_set(renderer, - "text", cell_text, "foreground-set", FALSE, "background-set", FALSE, NULL); } - g_free(cell_text); } void |