aboutsummaryrefslogtreecommitdiffstats
path: root/gtk/dfilter_expr_dlg.c
diff options
context:
space:
mode:
authorUlf Lamping <ulf.lamping@web.de>2005-08-10 19:49:45 +0000
committerUlf Lamping <ulf.lamping@web.de>2005-08-10 19:49:45 +0000
commitd28861b607328bbbb06c3032908ab7d62b467dea (patch)
tree36baba4cd69a9a59a0e887363013f51d2e4d9008 /gtk/dfilter_expr_dlg.c
parent4889bace3d2560c6e1713d723711911f3a6fd84a (diff)
removed tons of MSVC const related warnings.
This might at some places interfere with the changes for gcc4, we might have to negotiate in that case :-) Please note that a lot of these warnings were GTK1.x related only! svn path=/trunk/; revision=15286
Diffstat (limited to 'gtk/dfilter_expr_dlg.c')
-rw-r--r--gtk/dfilter_expr_dlg.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/gtk/dfilter_expr_dlg.c b/gtk/dfilter_expr_dlg.c
index 515fc7b2f8..71d84c2c91 100644
--- a/gtk/dfilter_expr_dlg.c
+++ b/gtk/dfilter_expr_dlg.c
@@ -85,7 +85,7 @@ static void build_enum_values(GtkWidget *value_list_scrolled_win,
GtkWidget *value_list,
const value_string *values);
static void add_value_list_item(GtkWidget *value_list, const gchar *string,
- gpointer data);
+ const gpointer data);
static void display_value_fields(header_field_info *hfinfo,
gboolean is_comparison, GtkWidget *value_label,
GtkWidget *value_entry,
@@ -431,7 +431,7 @@ build_boolean_values(GtkWidget *value_list_scrolled_win, GtkWidget *value_list,
*/
if (values == NULL)
values = &true_false;
- add_value_list_item(value_list, values->true_string, values);
+ add_value_list_item(value_list, values->true_string, (const gpointer) values);
add_value_list_item(value_list, values->false_string, NULL);
/*
@@ -488,7 +488,7 @@ build_enum_values(GtkWidget *value_list_scrolled_win _U_, GtkWidget *value_list,
*/
while (values->strptr != NULL) {
add_value_list_item(value_list, values->strptr,
- values);
+ (const gpointer) values);
values++;
}
@@ -503,7 +503,7 @@ build_enum_values(GtkWidget *value_list_scrolled_win _U_, GtkWidget *value_list,
}
static void
-add_value_list_item(GtkWidget *value_list, const gchar *string, gpointer data)
+add_value_list_item(GtkWidget *value_list, const gchar *string, const gpointer data)
{
#if GTK_MAJOR_VERSION < 2
GtkWidget *label, *item;
@@ -1078,7 +1078,7 @@ dfilter_expr_dlg_new(GtkWidget *filter_te)
#if GTK_MAJOR_VERSION < 2
int len;
void *cookie;
- gchar *name;
+ const gchar *name;
GHashTable *proto_array;
GtkCTreeNode *protocol_node, *item_node;
#else
@@ -1326,7 +1326,7 @@ dfilter_expr_dlg_new(GtkWidget *filter_te)
name = proto_get_protocol_short_name(protocol); /* name, short_name or filter name ? */
protocol_node = gtk_ctree_insert_node(GTK_CTREE(field_tree),
NULL, NULL,
- &name, 5,
+ (gchar **) &name, 5,
NULL, NULL, NULL, NULL,
FALSE, FALSE);
gtk_ctree_node_set_row_data(GTK_CTREE(field_tree), protocol_node,