osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Clean up white space and indentation; remove tabs. 

svn path=/trunk/; revision=42438
This commit is contained in:
Jeff Morriss 2012-05-05 14:37:19 +00:00
parent 48f4ae6e3b
commit 24f5265620
1 changed files with 36 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ui/gtk/main_filter_toolbar.c
View File

@ -114,7 +114,8 @@ filter_save_cb(GtkWidget *w _U_, GtkWindow *parent_w)
}
GtkWidget *filter_toolbar_new(void)
GtkWidget *
filter_toolbar_new(void)
{
GtkWidget *filter_cm;
GtkWidget *filter_te;
@ -150,7 +151,7 @@ GtkWidget *filter_toolbar_new(void)
gtk_toolbar_insert(GTK_TOOLBAR(filter_tb),
filter_bt,
-1);
gtk_widget_set_tooltip_text( GTK_WIDGET(filter_bt), "Open the \"Display Filter\" dialog, to edit/apply filters");
gtk_widget_set_tooltip_text(GTK_WIDGET(filter_bt), "Open the \"Display Filter\" dialog, to edit/apply filters");
/* Create the filter combobox */
filter_cm = gtk_combo_box_text_new_with_entry ();
@ -173,9 +174,7 @@ GtkWidget *filter_toolbar_new(void)
gtk_container_add (GTK_CONTAINER (item), filter_cm);
gtk_widget_show (GTK_WIDGET (item));
gtk_toolbar_insert(GTK_TOOLBAR(filter_tb),
item,
-1);
gtk_toolbar_insert(GTK_TOOLBAR(filter_tb), item, -1);
/* setting a tooltip for a combobox will do nothing, so add it to the corresponding text entry */
gtk_widget_set_tooltip_text(filter_cm,
@ -297,7 +296,7 @@ dfilter_entry_match(GtkWidget *filter_cm, char *s, int *index)
int i;
i = -1;
if (!gtk_tree_model_get_iter_first (model, &iter)){
if (!gtk_tree_model_get_iter_first (model, &iter)) {
*index = i;
return FALSE;
}
@ -305,15 +304,15 @@ dfilter_entry_match(GtkWidget *filter_cm, char *s, int *index)
i++;
gtk_tree_model_get_value (model, &iter, 0, &value);
filter_str = g_value_get_string (&value);
if(filter_str){
if(strcmp(s, filter_str) == 0){
if(filter_str) {
if(strcmp(s, filter_str) == 0) {
g_value_unset (&value);
*index = i;
return TRUE;
}
}
g_value_unset (&value);
}while (gtk_tree_model_iter_next (model, &iter));
} while (gtk_tree_model_iter_next (model, &iter));
*index = i;
return FALSE;
@ -398,11 +397,11 @@ main_filter_packets(capture_file *cf, const gchar *dftext, gboolean force)
if (cf_status == CF_OK && strlen(s) > 0) {
int index;
if(!dfilter_entry_match(filter_cm,s, &index)){
if(!dfilter_entry_match(filter_cm,s, &index)) {
gtk_combo_box_text_prepend_text(GTK_COMBO_BOX_TEXT(filter_cm), s);
index++;
}
while ((guint)index >= prefs.gui_recent_df_entries_max){
while ((guint)index >= prefs.gui_recent_df_entries_max) {
gtk_combo_box_text_remove(GTK_COMBO_BOX_TEXT(filter_cm), index);
index--;
}