From Jason Wzhy via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9157 :

[metze/wireshark/wip.git] / color_filters.h

diff --git a/color_filters.h b/color_filters.h
index 9c4e8d1822ed408efc0bdadc4edba6f6ff8a2e3e..6e21a181a6a1f1b70a374e8c1b9a60843283c056 100644 (file)
--- a/color_filters.h
+++ b/color_filters.h
@@ -19,31 +19,34 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 #ifndef  __COLOR_FILTERS_H__
 #define  __COLOR_FILTERS_H__
 
-#define TEMP_COLOR_PREFIX       "___tmp_color_filter___"
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#define CONVERSATION_COLOR_PREFIX       "___conversation_color_filter___"
 /** @file
  *  Color filters.
  */
 
 /* Data for a color filter. */
 typedef struct _color_filter {
-    gchar     *filter_name;   /* name of the filter */
-    gchar     *filter_text;   /* text of the filter expression */
-    color_t    bg_color;      /* background color for packets that match */
-    color_t    fg_color;      /* foreground color for packets that match */
-    gboolean   disabled;      /* set if the filter is disabled */
-    gboolean   selected;      /* set if the filter is selected in the color dialog box */
-
-    /* only used inside of color_filters.c */
-    dfilter_t *c_colorfilter; /* compiled filter expression */
-
-    /* only used outside of color_filters.c (beside init) */
-    void      *edit_dialog;   /* if filter is being edited, dialog
-                               * box for it */
+    gchar     *filter_name;         /* name of the filter */
+    gchar     *filter_text;         /* text of the filter expression */
+    color_t    bg_color;            /* background color for packets that match */
+    color_t    fg_color;            /* foreground color for packets that match */
+    gboolean   disabled;            /* set if the filter is disabled */
+    gboolean   selected;            /* set if the filter is selected in the color dialog box */
+
+                                    /* only used inside of color_filters.c */
+    dfilter_t *c_colorfilter;       /* compiled filter expression */
+
+                                    /* only used outside of color_filters.c (beside init) */
+    void      *color_edit_dlg_info; /* if filter is being edited, ptr to req'd info */
 } color_filter_t;
 
 
@@ -99,16 +102,11 @@ void color_filters_prime_edt(epan_dissect_t *edt);
 
 /** Colorize a specific packet.
  *
- * @param row the row in the packet list
  * @param edt the dissected packet
  * @return the matching color filter or NULL
  */
 const color_filter_t *
-#ifdef NEW_PACKET_LIST
 color_filters_colorize_packet(epan_dissect_t *edt);
-#else
-color_filters_colorize_packet(gint row, epan_dissect_t *edt);
-#endif
 
 /** Clone the currently active filter list.
  *
@@ -194,6 +192,21 @@ void color_filter_delete(color_filter_t *colorf);
  */
 void color_filter_list_delete(GSList **cfl);
 
-
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
 
 #endif
+
+/*
+ * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+ *
+ * Local variables:
+ * c-basic-offset: 4
+ * tab-width: 8
+ * indent-tabs-mode: nil
+ * End:
+ *
+ * vi: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
+ */