"gtk_entry_get_text()" returns a "const char *" - assign the result to

one.

"get_basename()" doesn't modify its argument, and its callers don't
modify the substring pointed to by the result, so make it take a "const
char *" as an argument and return a "const char *". 

"find_last_pathname_separator()" doesn't modify its argument, so make it
a "const char *" - but some of its callers pass a non-"const" "char *"
and modify the result, so don't make its return value a "const char *".
And, as none of its callers are outside "filesystem.c", make it static.

In "about_folders_page_new()", have separate variables for pathnames
returned as "const char *" (which are cached by the routine that returns
them, so you can't modify them - and can't free them, so get rid of the
commented-out "g_free()" calls for them) and pathnames returned as "char
*" (which are allocated anew for each call, and can be modified, but
have to be freed).

Clean up white space.

svn path=/trunk/; revision=12881

1 files changed, 3 insertions, 3 deletions

diff --git a/gtk/tap_dfilter_dlg.c b/gtk/tap_dfilter_dlg.c
index 9cf5671eba..be713cd836 100644
--- a/gtk/tap_dfilter_dlg.c
+++ b/gtk/tap_dfilter_dlg.c
@@ -85,16 +85,16 @@ dlg_destroy_cb(GtkWidget *item _U_, gpointer dialog_data)
 static void
 tap_dfilter_dlg_start_button_clicked(GtkWidget *item _U_, gpointer dialog_data)
 {
-	char *filter;
+	const char *filter;
 	char str[256];
 	
 	tap_dfilter_dlg_list_item *dlg_data = (tap_dfilter_dlg_list_item *) dialog_data;
 
-	filter=(char *)gtk_entry_get_text(GTK_ENTRY(dlg_data->filter_entry));
+	filter=gtk_entry_get_text(GTK_ENTRY(dlg_data->filter_entry));
 	if(filter[0]==0){
 		g_snprintf(str, sizeof(str), "%s", dlg_data->cont.init_string);
 	} else {
-		g_snprintf(str, sizeof(str), "%s,%s", dlg_data->cont.init_string, filter);		
+		g_snprintf(str, sizeof(str), "%s,%s", dlg_data->cont.init_string, filter);
 	}
 	(dlg_data->cont.tap_init_cb)(str);
 }