osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Renamed "___tmp_color_filter___" to "___conversation_color_filter___" 

in the coloring rule name to better describe where it comes from.

svn path=/trunk/; revision=37859
This commit is contained in:
Stig Bjørlykke 2011-07-01 21:13:40 +00:00
parent 21a1c33639
commit 6bdd7eed16
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
color_filters.c
View File

@ -109,7 +109,7 @@ color_filters_add_tmp(GSList **cfl)
bg_colors = g_strsplit(prefs.gui_colorized_bg, ",", -1);
for ( i=1 ; i<=10 ; i++ ) {
name = g_strdup_printf("%s%02d",TEMP_COLOR_PREFIX,i);
name = g_strdup_printf("%s%02d",CONVERSATION_COLOR_PREFIX,i);
/* retrieve background and foreground colors */
cval = strtoul(fg_colors[i-1], NULL, 16);
@ -165,7 +165,7 @@ color_filters_set_tmp(guint8 filt_nr, gchar *filter, gboolean disabled)
if( i!=filt_nr && filter==NULL )
continue;
name = g_strdup_printf("%s%02d",TEMP_COLOR_PREFIX,i);
name = g_strdup_printf("%s%02d",CONVERSATION_COLOR_PREFIX,i);
cfl = g_slist_find_custom(color_filter_list, name, color_filters_find_by_name_cb);
colorf = (color_filter_t *)cfl->data;
@ -708,7 +708,7 @@ write_filter(gpointer filter_arg, gpointer data_arg)
FILE *f = data->f;
if ( (colorf->selected || !data->only_selected) &&
(strstr(colorf->filter_name,TEMP_COLOR_PREFIX)==NULL) ) {
(strstr(colorf->filter_name,CONVERSATION_COLOR_PREFIX)==NULL) ) {
fprintf(f,"%s@%s@%s@[%d,%d,%d][%d,%d,%d]\n",
colorf->disabled ? "!" : "",
colorf->filter_name,

2
color_filters.h
View File

@ -24,7 +24,7 @@
#ifndef __COLOR_FILTERS_H__
#define __COLOR_FILTERS_H__
#define TEMP_COLOR_PREFIX "___tmp_color_filter___"
#define CONVERSATION_COLOR_PREFIX "___conversation_color_filter___"
/** @file
* Color filters.
*/

2
gtk/color_dlg.c
View File

@ -783,7 +783,7 @@ add_filter_to_list(gpointer filter_arg, gpointer list_arg, gboolean prepend)
GtkListStore *store;
GtkTreeIter iter;
if( strstr(colorf->filter_name,TEMP_COLOR_PREFIX)==NULL) {
if( strstr(colorf->filter_name,CONVERSATION_COLOR_PREFIX)==NULL) {
store = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(list_arg)));
if (prepend) {
gtk_list_store_prepend(store, &iter);