diff options
author | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2013-08-06 20:53:47 +0000 |
---|---|---|
committer | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2013-08-06 20:53:47 +0000 |
commit | 9cfac1227d8fd1f6de1d9e47489ea49616a2bee2 (patch) | |
tree | f48731d0b0c293e6af6f3476eae8fef06908059f /ui | |
parent | 72ea2f9c9c63c7e5c6270383888ad32683d96edf (diff) |
Replace hfinfo pointer to same_name_prev, with same_name_prev_id.
svn path=/trunk/; revision=51175
Diffstat (limited to 'ui')
-rw-r--r-- | ui/gtk/filter_autocomplete.c | 2 | ||||
-rw-r--r-- | ui/gtk/proto_hier_tree_model.c | 8 | ||||
-rw-r--r-- | ui/gtk/supported_protos_dlg.c | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/ui/gtk/filter_autocomplete.c b/ui/gtk/filter_autocomplete.c index 7cc92d2ea5..3513ba5075 100644 --- a/ui/gtk/filter_autocomplete.c +++ b/ui/gtk/filter_autocomplete.c @@ -661,7 +661,7 @@ build_autocompletion_list(GtkWidget *filter_te, GtkWidget *treeview, GtkWidget * hfinfo != NULL; hfinfo = proto_get_next_protocol_field(&cookie2)) { - if (hfinfo->same_name_prev != NULL) /* ignore duplicate names */ + if (hfinfo->same_name_prev_id != -1) /* ignore duplicate names */ continue; if(!g_ascii_strncasecmp(protocol_name, hfinfo->abbrev, protocol_name_len)) { diff --git a/ui/gtk/proto_hier_tree_model.c b/ui/gtk/proto_hier_tree_model.c index d6616557ac..fb71c34afd 100644 --- a/ui/gtk/proto_hier_tree_model.c +++ b/ui/gtk/proto_hier_tree_model.c @@ -95,7 +95,7 @@ proto_hier_tree_iter_nth_child(GtkTreeModel *tree_model, GtkTreeIter *iter, GtkT /* get n-th field of protocol */ hfinfo = proto_get_first_protocol_field(proto_id, &cookie); while (hfinfo) { - if (hfinfo->same_name_prev == NULL) { + if (hfinfo->same_name_prev_id == -1) { if (!n) break; n--; @@ -244,7 +244,7 @@ proto_hier_tree_iter_next(GtkTreeModel *tree_model, GtkTreeIter *iter) hfinfo = proto_get_next_protocol_field(&cookie2); /* get next field */ while (hfinfo) { - if (hfinfo->same_name_prev == NULL) + if (hfinfo->same_name_prev_id == -1) break; hfinfo = proto_get_next_protocol_field(&cookie2); } @@ -292,7 +292,7 @@ proto_hier_tree_iter_n_children(GtkTreeModel *tree_model, GtkTreeIter *iter) /* count not-duplicated fields */ for (hfinfo = proto_get_first_protocol_field(p_id, &cookie); hfinfo; hfinfo = proto_get_next_protocol_field(&cookie)) { - if (hfinfo->same_name_prev) + if (hfinfo->same_name_prev_id != -1) continue; count++; } @@ -353,7 +353,7 @@ proto_hier_tree_get_path(GtkTreeModel *tree_model, GtkTreeIter *iter) pos = 0; for (hfinfo = proto_get_first_protocol_field(p_id, &cookie); hfinfo && hfinfo != iter->user_data3; hfinfo = proto_get_next_protocol_field(&cookie)) { - if (hfinfo->same_name_prev) + if (hfinfo->same_name_prev_id != -1) continue; pos++; } diff --git a/ui/gtk/supported_protos_dlg.c b/ui/gtk/supported_protos_dlg.c index 3d02666a46..ff325eb128 100644 --- a/ui/gtk/supported_protos_dlg.c +++ b/ui/gtk/supported_protos_dlg.c @@ -259,7 +259,7 @@ static void set_supported_text(GtkWidget *w, supported_type_t type) for (hfinfo = proto_get_first_protocol_field(i, &cookie2); hfinfo != NULL; hfinfo = proto_get_next_protocol_field(&cookie2)) { - if (hfinfo->same_name_prev != NULL) /* ignore duplicate names */ + if (hfinfo->same_name_prev_id != -1) /* ignore duplicate names */ continue; if ((len = (int) strlen(hfinfo->abbrev)) > maxlen) @@ -287,7 +287,7 @@ static void set_supported_text(GtkWidget *w, supported_type_t type) for (hfinfo = proto_get_first_protocol_field(i, &cookie2); hfinfo != NULL; hfinfo = proto_get_next_protocol_field(&cookie2)) { - if (hfinfo->same_name_prev != NULL) /* ignore duplicate names */ + if (hfinfo->same_name_prev_id != -1) /* ignore duplicate names */ continue; count++; } @@ -300,7 +300,7 @@ static void set_supported_text(GtkWidget *w, supported_type_t type) for (hfinfo = proto_get_first_protocol_field(i, &cookie2); hfinfo != NULL; hfinfo = proto_get_next_protocol_field(&cookie2)) { - if (hfinfo->same_name_prev != NULL) /* ignore duplicate names */ + if (hfinfo->same_name_prev_id != -1) /* ignore duplicate names */ continue; type_name = ftype_pretty_name(hfinfo->type); |