forked from osmocom/wireshark
parent
0d4763b3e7
commit
58fd156d97
|
@ -77,17 +77,17 @@ airpcap_set_toolbar_start_capture(airpcap_if_info_t* if_info)
|
|||
|
||||
gchar *if_label_text;
|
||||
|
||||
airpcap_toolbar_label = g_object_get_data(G_OBJECT(wireless_tb),AIRPCAP_TOOLBAR_INTERFACE_KEY);
|
||||
toolbar_channel_cb = g_object_get_data(G_OBJECT(wireless_tb),AIRPCAP_TOOLBAR_CHANNEL_KEY);
|
||||
airpcap_toolbar_channel_lb = g_object_get_data(G_OBJECT(wireless_tb),AIRPCAP_TOOLBAR_CHANNEL_LABEL_KEY);
|
||||
airpcap_toolbar_channel_offset = g_object_get_data(G_OBJECT(wireless_tb),AIRPCAP_TOOLBAR_CHANNEL_OFFSET_KEY);
|
||||
airpcap_toolbar_channel_offset_lb = g_object_get_data(G_OBJECT(wireless_tb),AIRPCAP_TOOLBAR_CHANNEL_OFFSET_LABEL_KEY);
|
||||
airpcap_toolbar_fcs = g_object_get_data(G_OBJECT(wireless_tb),AIRPCAP_TOOLBAR_FCS_FILTER_KEY);
|
||||
airpcap_toolbar_fcs_lb = g_object_get_data(G_OBJECT(wireless_tb),AIRPCAP_TOOLBAR_FCS_FILTER_LABEL_KEY);
|
||||
airpcap_toolbar_button = g_object_get_data(G_OBJECT(wireless_tb),AIRPCAP_TOOLBAR_ADVANCED_KEY);
|
||||
airpcap_toolbar_decryption = g_object_get_data(G_OBJECT(wireless_tb),AIRPCAP_TOOLBAR_DECRYPTION_KEY);
|
||||
airpcap_toolbar_decryption_lb = g_object_get_data(G_OBJECT(wireless_tb),AIRPCAP_TOOLBAR_DECRYPTION_LABEL_KEY);
|
||||
airpcap_toolbar_keys_button = g_object_get_data(G_OBJECT(wireless_tb),AIRPCAP_TOOLBAR_KEY_MANAGEMENT_KEY);
|
||||
airpcap_toolbar_label = (GtkWidget *)g_object_get_data(G_OBJECT(wireless_tb),AIRPCAP_TOOLBAR_INTERFACE_KEY);
|
||||
toolbar_channel_cb = (GtkWidget *)g_object_get_data(G_OBJECT(wireless_tb),AIRPCAP_TOOLBAR_CHANNEL_KEY);
|
||||
airpcap_toolbar_channel_lb = (GtkWidget *)g_object_get_data(G_OBJECT(wireless_tb),AIRPCAP_TOOLBAR_CHANNEL_LABEL_KEY);
|
||||
airpcap_toolbar_channel_offset = (GtkWidget *)g_object_get_data(G_OBJECT(wireless_tb),AIRPCAP_TOOLBAR_CHANNEL_OFFSET_KEY);
|
||||
airpcap_toolbar_channel_offset_lb = (GtkWidget *)g_object_get_data(G_OBJECT(wireless_tb),AIRPCAP_TOOLBAR_CHANNEL_OFFSET_LABEL_KEY);
|
||||
airpcap_toolbar_fcs = (GtkWidget *)g_object_get_data(G_OBJECT(wireless_tb),AIRPCAP_TOOLBAR_FCS_FILTER_KEY);
|
||||
airpcap_toolbar_fcs_lb = (GtkWidget *)g_object_get_data(G_OBJECT(wireless_tb),AIRPCAP_TOOLBAR_FCS_FILTER_LABEL_KEY);
|
||||
airpcap_toolbar_button = (GtkWidget *)g_object_get_data(G_OBJECT(wireless_tb),AIRPCAP_TOOLBAR_ADVANCED_KEY);
|
||||
airpcap_toolbar_decryption = (GtkWidget *)g_object_get_data(G_OBJECT(wireless_tb),AIRPCAP_TOOLBAR_DECRYPTION_KEY);
|
||||
airpcap_toolbar_decryption_lb = (GtkWidget *)g_object_get_data(G_OBJECT(wireless_tb),AIRPCAP_TOOLBAR_DECRYPTION_LABEL_KEY);
|
||||
airpcap_toolbar_keys_button = (GtkWidget *)g_object_get_data(G_OBJECT(wireless_tb),AIRPCAP_TOOLBAR_KEY_MANAGEMENT_KEY);
|
||||
|
||||
/* The current interface is an airpcap interface */
|
||||
if (if_info != NULL)
|
||||
|
@ -170,18 +170,18 @@ airpcap_set_toolbar_stop_capture(airpcap_if_info_t* if_info)
|
|||
|
||||
gchar *if_label_text;
|
||||
|
||||
airpcap_toolbar_crc_filter_combo = g_object_get_data(G_OBJECT(wireless_tb),AIRPCAP_TOOLBAR_FCS_FILTER_KEY);
|
||||
airpcap_toolbar_label = g_object_get_data(G_OBJECT(wireless_tb),AIRPCAP_TOOLBAR_INTERFACE_KEY);
|
||||
toolbar_channel_cb = g_object_get_data(G_OBJECT(wireless_tb),AIRPCAP_TOOLBAR_CHANNEL_KEY);
|
||||
airpcap_toolbar_channel_lb = g_object_get_data(G_OBJECT(wireless_tb),AIRPCAP_TOOLBAR_CHANNEL_LABEL_KEY);
|
||||
airpcap_toolbar_channel_offset = g_object_get_data(G_OBJECT(wireless_tb),AIRPCAP_TOOLBAR_CHANNEL_OFFSET_KEY);
|
||||
airpcap_toolbar_channel_offset_lb = g_object_get_data(G_OBJECT(wireless_tb),AIRPCAP_TOOLBAR_CHANNEL_OFFSET_LABEL_KEY);
|
||||
airpcap_toolbar_fcs = g_object_get_data(G_OBJECT(wireless_tb),AIRPCAP_TOOLBAR_FCS_FILTER_KEY);
|
||||
airpcap_toolbar_fcs_lb = g_object_get_data(G_OBJECT(wireless_tb),AIRPCAP_TOOLBAR_FCS_FILTER_LABEL_KEY);
|
||||
airpcap_toolbar_button = g_object_get_data(G_OBJECT(wireless_tb),AIRPCAP_TOOLBAR_ADVANCED_KEY);
|
||||
airpcap_toolbar_decryption = g_object_get_data(G_OBJECT(wireless_tb),AIRPCAP_TOOLBAR_DECRYPTION_KEY);
|
||||
airpcap_toolbar_decryption_lb = g_object_get_data(G_OBJECT(wireless_tb),AIRPCAP_TOOLBAR_DECRYPTION_LABEL_KEY);
|
||||
airpcap_toolbar_keys_button = g_object_get_data(G_OBJECT(wireless_tb),AIRPCAP_TOOLBAR_KEY_MANAGEMENT_KEY);
|
||||
airpcap_toolbar_crc_filter_combo = (GtkWidget *)g_object_get_data(G_OBJECT(wireless_tb),AIRPCAP_TOOLBAR_FCS_FILTER_KEY);
|
||||
airpcap_toolbar_label = (GtkWidget *)g_object_get_data(G_OBJECT(wireless_tb),AIRPCAP_TOOLBAR_INTERFACE_KEY);
|
||||
toolbar_channel_cb = (GtkWidget *)g_object_get_data(G_OBJECT(wireless_tb),AIRPCAP_TOOLBAR_CHANNEL_KEY);
|
||||
airpcap_toolbar_channel_lb = (GtkWidget *)g_object_get_data(G_OBJECT(wireless_tb),AIRPCAP_TOOLBAR_CHANNEL_LABEL_KEY);
|
||||
airpcap_toolbar_channel_offset = (GtkWidget *)g_object_get_data(G_OBJECT(wireless_tb),AIRPCAP_TOOLBAR_CHANNEL_OFFSET_KEY);
|
||||
airpcap_toolbar_channel_offset_lb = (GtkWidget *)g_object_get_data(G_OBJECT(wireless_tb),AIRPCAP_TOOLBAR_CHANNEL_OFFSET_LABEL_KEY);
|
||||
airpcap_toolbar_fcs = (GtkWidget *)g_object_get_data(G_OBJECT(wireless_tb),AIRPCAP_TOOLBAR_FCS_FILTER_KEY);
|
||||
airpcap_toolbar_fcs_lb = (GtkWidget *)g_object_get_data(G_OBJECT(wireless_tb),AIRPCAP_TOOLBAR_FCS_FILTER_LABEL_KEY);
|
||||
airpcap_toolbar_button = (GtkWidget *)g_object_get_data(G_OBJECT(wireless_tb),AIRPCAP_TOOLBAR_ADVANCED_KEY);
|
||||
airpcap_toolbar_decryption = (GtkWidget *)g_object_get_data(G_OBJECT(wireless_tb),AIRPCAP_TOOLBAR_DECRYPTION_KEY);
|
||||
airpcap_toolbar_decryption_lb = (GtkWidget *)g_object_get_data(G_OBJECT(wireless_tb),AIRPCAP_TOOLBAR_DECRYPTION_LABEL_KEY);
|
||||
airpcap_toolbar_keys_button = (GtkWidget *)g_object_get_data(G_OBJECT(wireless_tb),AIRPCAP_TOOLBAR_KEY_MANAGEMENT_KEY);
|
||||
|
||||
/* The current interface is an airpcap interface */
|
||||
if (if_info != NULL)
|
||||
|
@ -1028,14 +1028,14 @@ airpcap_enable_toolbar_widgets(GtkWidget* w, gboolean en)
|
|||
|
||||
toolbar_tb = w;
|
||||
|
||||
if_description_lb = g_object_get_data(G_OBJECT(toolbar_tb),AIRPCAP_TOOLBAR_INTERFACE_KEY);
|
||||
channel_lb = g_object_get_data(G_OBJECT(toolbar_tb),AIRPCAP_TOOLBAR_CHANNEL_LABEL_KEY);
|
||||
toolbar_channel_cb = g_object_get_data(G_OBJECT(toolbar_tb),AIRPCAP_TOOLBAR_CHANNEL_KEY);
|
||||
channel_offset_cb = g_object_get_data(G_OBJECT(toolbar_tb),AIRPCAP_TOOLBAR_CHANNEL_OFFSET_KEY);
|
||||
channel_offset_lb = g_object_get_data(G_OBJECT(toolbar_tb),AIRPCAP_TOOLBAR_CHANNEL_OFFSET_LABEL_KEY);
|
||||
fcs_lb = g_object_get_data(G_OBJECT(toolbar_tb),AIRPCAP_TOOLBAR_FCS_FILTER_LABEL_KEY);
|
||||
fcs_cb = g_object_get_data(G_OBJECT(toolbar_tb),AIRPCAP_TOOLBAR_FCS_FILTER_KEY);
|
||||
advanced_bt = g_object_get_data(G_OBJECT(toolbar_tb),AIRPCAP_TOOLBAR_ADVANCED_KEY);
|
||||
if_description_lb = (GtkWidget *)g_object_get_data(G_OBJECT(toolbar_tb),AIRPCAP_TOOLBAR_INTERFACE_KEY);
|
||||
channel_lb = (GtkWidget *)g_object_get_data(G_OBJECT(toolbar_tb),AIRPCAP_TOOLBAR_CHANNEL_LABEL_KEY);
|
||||
toolbar_channel_cb = (GtkWidget *)g_object_get_data(G_OBJECT(toolbar_tb),AIRPCAP_TOOLBAR_CHANNEL_KEY);
|
||||
channel_offset_cb = (GtkWidget *)g_object_get_data(G_OBJECT(toolbar_tb),AIRPCAP_TOOLBAR_CHANNEL_OFFSET_KEY);
|
||||
channel_offset_lb = (GtkWidget *)g_object_get_data(G_OBJECT(toolbar_tb),AIRPCAP_TOOLBAR_CHANNEL_OFFSET_LABEL_KEY);
|
||||
fcs_lb = (GtkWidget *)g_object_get_data(G_OBJECT(toolbar_tb),AIRPCAP_TOOLBAR_FCS_FILTER_LABEL_KEY);
|
||||
fcs_cb = (GtkWidget *)g_object_get_data(G_OBJECT(toolbar_tb),AIRPCAP_TOOLBAR_FCS_FILTER_KEY);
|
||||
advanced_bt = (GtkWidget *)g_object_get_data(G_OBJECT(toolbar_tb),AIRPCAP_TOOLBAR_ADVANCED_KEY);
|
||||
|
||||
|
||||
if (if_description_lb != NULL)
|
||||
|
|
|
@ -83,7 +83,7 @@ decode_dcerpc_binding_clone(decode_dcerpc_bind_values_t *binding_in)
|
|||
{
|
||||
decode_dcerpc_bind_values_t *stored_binding;
|
||||
|
||||
stored_binding = g_malloc(sizeof(decode_dcerpc_bind_values_t));
|
||||
stored_binding = g_new(decode_dcerpc_bind_values_t,1);
|
||||
*stored_binding = *binding_in;
|
||||
COPY_ADDRESS(&stored_binding->addr_a, &binding_in->addr_a);
|
||||
COPY_ADDRESS(&stored_binding->addr_b, &binding_in->addr_b);
|
||||
|
@ -97,7 +97,7 @@ decode_dcerpc_binding_clone(decode_dcerpc_bind_values_t *binding_in)
|
|||
void
|
||||
decode_dcerpc_binding_free(void *binding_in)
|
||||
{
|
||||
decode_dcerpc_bind_values_t *binding = binding_in;
|
||||
decode_dcerpc_bind_values_t *binding = (decode_dcerpc_bind_values_t *)binding_in;
|
||||
|
||||
g_free((void *) binding->addr_a.data);
|
||||
g_free((void *) binding->addr_b.data);
|
||||
|
@ -111,8 +111,8 @@ decode_dcerpc_binding_free(void *binding_in)
|
|||
static gint
|
||||
decode_dcerpc_binding_cmp(gconstpointer a, gconstpointer b)
|
||||
{
|
||||
const decode_dcerpc_bind_values_t *binding_a = a;
|
||||
const decode_dcerpc_bind_values_t *binding_b = b;
|
||||
const decode_dcerpc_bind_values_t *binding_a = (const decode_dcerpc_bind_values_t *)a;
|
||||
const decode_dcerpc_bind_values_t *binding_b = (const decode_dcerpc_bind_values_t *)b;
|
||||
|
||||
|
||||
/* don't compare uuid and ver! */
|
||||
|
@ -146,7 +146,7 @@ decode_dcerpc_add_show_list_single(gpointer data, gpointer user_data)
|
|||
gchar string1[20];
|
||||
|
||||
|
||||
decode_dcerpc_bind_values_t *binding = data;
|
||||
decode_dcerpc_bind_values_t *binding = (decode_dcerpc_bind_values_t *)data;
|
||||
|
||||
g_snprintf(string1, sizeof(string1), "ctx_id: %u", binding->ctx_id);
|
||||
|
||||
|
@ -179,7 +179,7 @@ decode_dcerpc_reset_all(void)
|
|||
decode_dcerpc_bind_values_t *binding;
|
||||
|
||||
while(decode_dcerpc_bindings) {
|
||||
binding = decode_dcerpc_bindings->data;
|
||||
binding = (decode_dcerpc_bind_values_t *)decode_dcerpc_bindings->data;
|
||||
|
||||
decode_dcerpc_binding_free(binding);
|
||||
decode_dcerpc_bindings = g_slist_remove(
|
||||
|
@ -206,7 +206,7 @@ decode_dcerpc_bind_values_t *binding)
|
|||
if(le == NULL)
|
||||
return;
|
||||
|
||||
old_binding = le->data;
|
||||
old_binding = (decode_dcerpc_bind_values_t *)le->data;
|
||||
|
||||
decode_dcerpc_bindings = g_slist_remove(decode_dcerpc_bindings, le->data);
|
||||
|
||||
|
@ -289,11 +289,11 @@ decode_dcerpc(GtkWidget *notebook_pg)
|
|||
decode_dcerpc_bind_values_t *binding;
|
||||
|
||||
|
||||
list = g_object_get_data(G_OBJECT(notebook_pg), E_PAGE_LIST);
|
||||
list = (GtkWidget *)g_object_get_data(G_OBJECT(notebook_pg), E_PAGE_LIST);
|
||||
if (requested_action == E_DECODE_NO)
|
||||
gtk_tree_selection_unselect_all(gtk_tree_view_get_selection(GTK_TREE_VIEW(list)));
|
||||
|
||||
binding = g_object_get_data(G_OBJECT(notebook_pg), E_PAGE_BINDING);
|
||||
binding = (decode_dcerpc_bind_values_t *)g_object_get_data(G_OBJECT(notebook_pg), E_PAGE_BINDING);
|
||||
|
||||
/*table_name = g_object_get_data(G_OBJECT(notebook_pg), E_PAGE_TABLE);*/
|
||||
table_name = "DCE-RPC";
|
||||
|
@ -311,7 +311,7 @@ static void
|
|||
decode_dcerpc_add_to_list(gpointer key, gpointer value, gpointer user_data)
|
||||
{
|
||||
/*dcerpc_uuid_key *k = key;*/
|
||||
dcerpc_uuid_value *v = value;
|
||||
dcerpc_uuid_value *v = (dcerpc_uuid_value *)value;
|
||||
|
||||
if(strcmp(v->name, "(none)"))
|
||||
decode_add_to_list("DCE-RPC", v->name, key, user_data);
|
||||
|
@ -343,7 +343,7 @@ decode_dcerpc_add_page (packet_info *pinfo)
|
|||
|
||||
|
||||
/* clone binding */
|
||||
binding = g_malloc(sizeof(decode_dcerpc_bind_values_t));
|
||||
binding = g_new(decode_dcerpc_bind_values_t,1);
|
||||
COPY_ADDRESS(&binding->addr_a, &pinfo->src);
|
||||
COPY_ADDRESS(&binding->addr_b, &pinfo->dst);
|
||||
binding->ptype = pinfo->ptype;
|
||||
|
|
|
@ -96,24 +96,24 @@ static void display_value_fields(header_field_info *hfinfo,
|
|||
static void
|
||||
field_select_row_cb(GtkTreeSelection *sel, gpointer tree)
|
||||
{
|
||||
GtkWidget *window = gtk_widget_get_toplevel(tree);
|
||||
GtkWidget *relation_list = g_object_get_data(G_OBJECT(window),
|
||||
GtkWidget *window = (GtkWidget *)gtk_widget_get_toplevel(tree);
|
||||
GtkWidget *relation_list = (GtkWidget *)g_object_get_data(G_OBJECT(window),
|
||||
E_DFILTER_EXPR_RELATION_LIST_KEY);
|
||||
GtkWidget *range_label = g_object_get_data(G_OBJECT(window),
|
||||
GtkWidget *range_label = (GtkWidget *)g_object_get_data(G_OBJECT(window),
|
||||
E_DFILTER_EXPR_RANGE_LABEL_KEY);
|
||||
GtkWidget *range_entry = g_object_get_data(G_OBJECT(window),
|
||||
GtkWidget *range_entry = (GtkWidget *)g_object_get_data(G_OBJECT(window),
|
||||
E_DFILTER_EXPR_RANGE_ENTRY_KEY);
|
||||
GtkWidget *value_label = g_object_get_data(G_OBJECT(window),
|
||||
GtkWidget *value_label = (GtkWidget *)g_object_get_data(G_OBJECT(window),
|
||||
E_DFILTER_EXPR_VALUE_LABEL_KEY);
|
||||
GtkWidget *value_entry = g_object_get_data(G_OBJECT(window),
|
||||
GtkWidget *value_entry = (GtkWidget *)g_object_get_data(G_OBJECT(window),
|
||||
E_DFILTER_EXPR_VALUE_ENTRY_KEY);
|
||||
GtkWidget *value_list_label = g_object_get_data(G_OBJECT(window),
|
||||
GtkWidget *value_list_label = (GtkWidget *)g_object_get_data(G_OBJECT(window),
|
||||
E_DFILTER_EXPR_VALUE_LIST_LABEL_KEY);
|
||||
GtkWidget *value_list = g_object_get_data(G_OBJECT(window),
|
||||
GtkWidget *value_list = (GtkWidget *)g_object_get_data(G_OBJECT(window),
|
||||
E_DFILTER_EXPR_VALUE_LIST_KEY);
|
||||
GtkWidget *value_list_scrolled_win = g_object_get_data(G_OBJECT(window),
|
||||
GtkWidget *value_list_scrolled_win = (GtkWidget *)g_object_get_data(G_OBJECT(window),
|
||||
E_DFILTER_EXPR_VALUE_LIST_SW_KEY);
|
||||
GtkWidget *ok_bt = g_object_get_data(G_OBJECT(window),
|
||||
GtkWidget *ok_bt = (GtkWidget *)g_object_get_data(G_OBJECT(window),
|
||||
E_DFILTER_EXPR_OK_BT_KEY);
|
||||
header_field_info *hfinfo, *cur_hfinfo;
|
||||
const char *value_type;
|
||||
|
@ -128,7 +128,7 @@ field_select_row_cb(GtkTreeSelection *sel, gpointer tree)
|
|||
/*
|
||||
* What was the item that was last selected?
|
||||
*/
|
||||
cur_hfinfo = g_object_get_data(G_OBJECT(window), E_DFILTER_EXPR_CURRENT_VAR_KEY);
|
||||
cur_hfinfo = (header_field_info *)g_object_get_data(G_OBJECT(window), E_DFILTER_EXPR_CURRENT_VAR_KEY);
|
||||
if (cur_hfinfo == hfinfo) {
|
||||
/*
|
||||
* It's still selected; no need to change anything.
|
||||
|
@ -171,7 +171,7 @@ field_select_row_cb(GtkTreeSelection *sel, gpointer tree)
|
|||
* and "false"; show them in the value list.
|
||||
*/
|
||||
build_boolean_values(value_list_scrolled_win, value_list,
|
||||
hfinfo->strings);
|
||||
(const true_false_string *)hfinfo->strings);
|
||||
break;
|
||||
|
||||
case FT_UINT8:
|
||||
|
@ -190,9 +190,9 @@ field_select_row_cb(GtkTreeSelection *sel, gpointer tree)
|
|||
if ((hfinfo->strings != NULL) &&
|
||||
! (hfinfo->display & BASE_RANGE_STRING) &&
|
||||
! ((hfinfo->display & BASE_DISPLAY_E_MASK) == BASE_CUSTOM)) {
|
||||
const value_string *vals = hfinfo->strings;
|
||||
const value_string *vals = (const value_string *)hfinfo->strings;
|
||||
if (hfinfo->display & BASE_EXT_STRING)
|
||||
vals = VALUE_STRING_EXT_VS_P((value_string_ext *)vals);
|
||||
vals = VALUE_STRING_EXT_VS_P((const value_string_ext *)vals);
|
||||
build_enum_values(value_list_scrolled_win, value_list, vals);
|
||||
} else
|
||||
gtk_list_store_clear(GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(value_list))));
|
||||
|
@ -286,21 +286,21 @@ relation_list_sel_cb(GtkTreeSelection *sel, gpointer user_data _U_)
|
|||
{
|
||||
GtkWidget *window = gtk_widget_get_toplevel(GTK_WIDGET(gtk_tree_selection_get_tree_view(sel)));
|
||||
GtkWidget *range_label =
|
||||
g_object_get_data(G_OBJECT(window), E_DFILTER_EXPR_RANGE_LABEL_KEY);
|
||||
(GtkWidget *)g_object_get_data(G_OBJECT(window), E_DFILTER_EXPR_RANGE_LABEL_KEY);
|
||||
GtkWidget *range_entry =
|
||||
g_object_get_data(G_OBJECT(window), E_DFILTER_EXPR_RANGE_ENTRY_KEY);
|
||||
(GtkWidget *)g_object_get_data(G_OBJECT(window), E_DFILTER_EXPR_RANGE_ENTRY_KEY);
|
||||
GtkWidget *value_label =
|
||||
g_object_get_data(G_OBJECT(window), E_DFILTER_EXPR_VALUE_LABEL_KEY);
|
||||
(GtkWidget *)g_object_get_data(G_OBJECT(window), E_DFILTER_EXPR_VALUE_LABEL_KEY);
|
||||
GtkWidget *value_entry =
|
||||
g_object_get_data(G_OBJECT(window), E_DFILTER_EXPR_VALUE_ENTRY_KEY);
|
||||
(GtkWidget *)g_object_get_data(G_OBJECT(window), E_DFILTER_EXPR_VALUE_ENTRY_KEY);
|
||||
GtkWidget *value_list_label =
|
||||
g_object_get_data(G_OBJECT(window), E_DFILTER_EXPR_VALUE_LIST_LABEL_KEY);
|
||||
(GtkWidget *)g_object_get_data(G_OBJECT(window), E_DFILTER_EXPR_VALUE_LIST_LABEL_KEY);
|
||||
GtkWidget *value_list =
|
||||
g_object_get_data(G_OBJECT(window), E_DFILTER_EXPR_VALUE_LIST_KEY);
|
||||
(GtkWidget *)g_object_get_data(G_OBJECT(window), E_DFILTER_EXPR_VALUE_LIST_KEY);
|
||||
GtkWidget *value_list_scrolled_win =
|
||||
g_object_get_data(G_OBJECT(window), E_DFILTER_EXPR_VALUE_LIST_SW_KEY);
|
||||
(GtkWidget *)g_object_get_data(G_OBJECT(window), E_DFILTER_EXPR_VALUE_LIST_SW_KEY);
|
||||
header_field_info *hfinfo =
|
||||
g_object_get_data(G_OBJECT(window), E_DFILTER_EXPR_CURRENT_VAR_KEY);
|
||||
(header_field_info *)g_object_get_data(G_OBJECT(window), E_DFILTER_EXPR_CURRENT_VAR_KEY);
|
||||
gchar *item_str;
|
||||
GtkTreeModel *model;
|
||||
GtkTreeIter iter;
|
||||
|
@ -392,7 +392,7 @@ build_enum_values(GtkWidget *value_list_scrolled_win _U_, GtkWidget *value_list,
|
|||
* Build the list.
|
||||
*/
|
||||
while (values->strptr != NULL) {
|
||||
add_value_list_item(value_list, values->strptr, (gpointer) values);
|
||||
add_value_list_item(value_list, values->strptr, (const gpointer) values);
|
||||
values++;
|
||||
}
|
||||
|
||||
|
@ -508,11 +508,11 @@ display_value_fields(header_field_info *hfinfo, gboolean is_comparison,
|
|||
static void
|
||||
value_list_sel_cb(GtkTreeSelection *sel, gpointer value_entry_arg)
|
||||
{
|
||||
GtkWidget *value_entry = value_entry_arg;
|
||||
GtkWidget *value_entry = (GtkWidget *)value_entry_arg;
|
||||
GtkWidget *window = gtk_widget_get_toplevel(GTK_WIDGET(gtk_tree_selection_get_tree_view(sel)));
|
||||
GtkTreeModel *model;
|
||||
GtkTreeIter iter;
|
||||
header_field_info *hfinfo = g_object_get_data(G_OBJECT(window),
|
||||
header_field_info *hfinfo = (header_field_info *)g_object_get_data(G_OBJECT(window),
|
||||
E_DFILTER_EXPR_CURRENT_VAR_KEY);
|
||||
const value_string *value = NULL;
|
||||
gchar *value_display_string = NULL;
|
||||
|
@ -602,14 +602,14 @@ dfilter_report_bad_value(const char *format, ...)
|
|||
static void
|
||||
dfilter_expr_dlg_accept_cb(GtkWidget *w, gpointer filter_te_arg)
|
||||
{
|
||||
GtkWidget *filter_te = filter_te_arg;
|
||||
GtkWidget *filter_te = (GtkWidget *)filter_te_arg;
|
||||
GtkWidget *window = gtk_widget_get_toplevel(w);
|
||||
GtkWidget *relation_list =
|
||||
g_object_get_data(G_OBJECT(window), E_DFILTER_EXPR_RELATION_LIST_KEY);
|
||||
(GtkWidget *)g_object_get_data(G_OBJECT(window), E_DFILTER_EXPR_RELATION_LIST_KEY);
|
||||
GtkWidget *range_entry =
|
||||
g_object_get_data(G_OBJECT(window), E_DFILTER_EXPR_RANGE_ENTRY_KEY);
|
||||
(GtkWidget *)g_object_get_data(G_OBJECT(window), E_DFILTER_EXPR_RANGE_ENTRY_KEY);
|
||||
GtkWidget *value_entry =
|
||||
g_object_get_data(G_OBJECT(window), E_DFILTER_EXPR_VALUE_ENTRY_KEY);
|
||||
(GtkWidget *)g_object_get_data(G_OBJECT(window), E_DFILTER_EXPR_VALUE_ENTRY_KEY);
|
||||
header_field_info *hfinfo;
|
||||
gchar *item_str;
|
||||
gchar *range_str, *stripped_range_str;
|
||||
|
@ -626,7 +626,7 @@ dfilter_expr_dlg_accept_cb(GtkWidget *w, gpointer filter_te_arg)
|
|||
/*
|
||||
* Get the variable to be tested.
|
||||
*/
|
||||
hfinfo = g_object_get_data(G_OBJECT(window), E_DFILTER_EXPR_CURRENT_VAR_KEY);
|
||||
hfinfo = (header_field_info *)g_object_get_data(G_OBJECT(window), E_DFILTER_EXPR_CURRENT_VAR_KEY);
|
||||
|
||||
/*
|
||||
* Get the relation operator to use.
|
||||
|
@ -1114,11 +1114,11 @@ dfilter_expr_dlg_new(GtkWidget *filter_te)
|
|||
gtk_box_pack_start(GTK_BOX(main_vb), list_bb, FALSE, FALSE, 0);
|
||||
gtk_container_set_border_width (GTK_CONTAINER (list_bb), 0);
|
||||
|
||||
ok_bt = g_object_get_data(G_OBJECT(list_bb), GTK_STOCK_OK);
|
||||
ok_bt = (GtkWidget *)g_object_get_data(G_OBJECT(list_bb), GTK_STOCK_OK);
|
||||
gtk_widget_set_sensitive(ok_bt, FALSE);
|
||||
g_signal_connect(ok_bt, "clicked", G_CALLBACK(dfilter_expr_dlg_accept_cb), filter_te);
|
||||
|
||||
cancel_bt = g_object_get_data(G_OBJECT(list_bb), GTK_STOCK_CANCEL);
|
||||
cancel_bt = (GtkWidget *)g_object_get_data(G_OBJECT(list_bb), GTK_STOCK_CANCEL);
|
||||
window_set_cancel_button(window, cancel_bt, NULL);
|
||||
g_signal_connect(cancel_bt, "clicked", G_CALLBACK(dfilter_expr_dlg_cancel_cb), window);
|
||||
|
||||
|
|
Loading…
Reference in New Issue