"main_menu.[ch]" -> "menus.[ch]"; it handles not only the main menu, but

[obnox/wireshark/wip.git] / gtk / capture_file_dlg.c

diff --git a/gtk/capture_file_dlg.c b/gtk/capture_file_dlg.c
index ade9389a6fb171035d3d59f117358f9e232c4bb3..b4b472ecffaecce7c278f7dc0e2f169224ac8d9f 100644 (file)
--- a/gtk/capture_file_dlg.c
+++ b/gtk/capture_file_dlg.c
@@ -58,7 +58,7 @@
 #include "gtk/capture_file_dlg.h"
 #include "gtk/drag_and_drop.h"
 #include "gtk/main.h"
-#include "gtk/main_menu.h"
+#include "gtk/menus.h"
 #include "gtk/recent.h"
 #include "gtk/color_dlg.h"
 #ifdef HAVE_LIBPCAP
@@ -187,7 +187,7 @@ preview_set_filename(GtkWidget *prev, const gchar *cf_name)
     gtk_label_set_text(GTK_LABEL(label), string_buff);
 
     /* type */
-    g_snprintf(string_buff, PREVIEW_STR_MAX, "%s", wtap_file_type_string(wtap_file_type(wth)));
+    g_strlcpy(string_buff, wtap_file_type_string(wtap_file_type(wth)), PREVIEW_STR_MAX);
     label = g_object_get_data(G_OBJECT(prev), PREVIEW_FORMAT_KEY);
     gtk_label_set_text(GTK_LABEL(label), string_buff);
 
@@ -323,7 +323,7 @@ static void
 file_open_entry_changed(GtkWidget *w _U_, gpointer file_sel)
 {
     GtkWidget *prev = g_object_get_data(G_OBJECT(file_sel), PREVIEW_TABLE_KEY);
-    const gchar* cf_name;
+    gchar *cf_name;
     gboolean have_preview;
     wtap       *wth;
 
@@ -334,6 +334,8 @@ file_open_entry_changed(GtkWidget *w _U_, gpointer file_sel)
     wth = preview_set_filename(prev, cf_name);
     have_preview = (wth != NULL);
 
+    g_free(cf_name);
+
     /* make the preview widget sensitive */
     gtk_widget_set_sensitive(prev, have_preview);
 
@@ -361,12 +363,12 @@ add_string_to_table_sensitive(GtkWidget *list, guint *row, const gchar *title, c
     }
     label = gtk_label_new(indent);
     g_free(indent);
-    gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
+    gtk_misc_set_alignment(GTK_MISC(label), 0.0f, 0.5f);
     gtk_widget_set_sensitive(label, sensitive);
     gtk_table_attach_defaults(GTK_TABLE(list), label, 0, 1, *row, *row+1);
 
     label = gtk_label_new(value);
-    gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
+    gtk_misc_set_alignment(GTK_MISC(label), 0.0f, 0.5f);
     gtk_widget_set_sensitive(label, sensitive);
     gtk_table_attach_defaults(GTK_TABLE(list), label, 1, 2, *row, *row+1);
 
@@ -600,7 +602,7 @@ file_open_ok_cb(GtkWidget *w, gpointer fs) {
   dfilter_t   *rfcode = NULL;
   int          err;
 
-  cf_name = g_strdup(gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(fs)));
+  cf_name = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(fs));
   filter_te = g_object_get_data(G_OBJECT(w), E_RFILTER_TE_KEY);
   rfilter = gtk_entry_get_text(GTK_ENTRY(filter_te));
   if (!dfilter_compile(rfilter, &rfcode)) {
@@ -914,7 +916,7 @@ file_merge_ok_cb(GtkWidget *w, gpointer fs) {
   char        *in_filenames[2];
   char        *tmpname;
 
-  cf_name = g_strdup(gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(fs)));
+  cf_name = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(fs));
   filter_te = g_object_get_data(G_OBJECT(w), E_RFILTER_TE_KEY);
   rfilter = gtk_entry_get_text(GTK_ENTRY(filter_te));
   if (!dfilter_compile(rfilter, &rfcode)) {
@@ -1279,7 +1281,7 @@ file_save_as_cb(GtkWidget *w _U_, gpointer fs) {
   GtkWidget *compressed_cb;
 
 
-  cf_name = g_strdup(gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(fs)));
+  cf_name = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(fs));
 
   compressed_cb = g_object_get_data(G_OBJECT(file_save_as_w), "compressed");
 
@@ -1352,7 +1354,7 @@ static void file_save_as_exists_answered_cb(gpointer dialog _U_, gint btn, gpoin
 {
     gchar      *cf_name;
 
-    cf_name = g_strdup(gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(data)));
+    cf_name = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(data));
 
     switch(btn) {
     case(ESD_BTN_OK):
@@ -1370,6 +1372,7 @@ static void file_save_as_exists_answered_cb(gpointer dialog _U_, gint btn, gpoin
     default:
         g_assert_not_reached();
     }
+    g_free(cf_name);
 }
 
 
@@ -1379,7 +1382,7 @@ file_save_as_ok_cb(GtkWidget *w _U_, gpointer fs) {
   gchar        *cf_name;
   gpointer  dialog;
 
-  cf_name = g_strdup(gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(fs)));
+  cf_name = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(fs));
 
   /* Perhaps the user specified a directory instead of a file.
      Check whether they did. */
@@ -1546,7 +1549,7 @@ file_color_import_ok_cb(GtkWidget *w, gpointer color_filters) {
   gchar     *cf_name, *s;
   GtkWidget *fs = gtk_widget_get_toplevel(w);
 
-  cf_name = g_strdup(gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(fs)));
+  cf_name = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(fs));
 
   /* Perhaps the user specified a directory instead of a file.
      Check whether they did. */
@@ -1570,8 +1573,7 @@ file_color_import_ok_cb(GtkWidget *w, gpointer color_filters) {
     /* XXX - as we cannot start a new event loop (using gtk_dialog_run()),
      * as this will prevent the user from closing the now existing error
      * message, simply close the dialog (this is the best we can do here). */
-    if (file_save_as_w)
-      window_destroy(GTK_WIDGET (fs));
+    window_destroy(GTK_WIDGET (fs));
 
     return;
   }
@@ -1645,9 +1647,7 @@ file_color_export_cmd_cb(GtkWidget *w _U_, gpointer filter_list)
     return;
   }
 
-  /* Default to saving all packets, in the file's current format. */
   color_selected   = FALSE;
-  filetype = cfile.cd_t;
 
   file_color_export_w = file_selection_new("Wireshark: Export Color Filters",
                                            FILE_SELECTION_SAVE);
@@ -1689,7 +1689,7 @@ file_color_export_ok_cb(GtkWidget *w, gpointer filter_list) {
   gchar        *dirname;
   GtkWidget *fs = gtk_widget_get_toplevel(w);
 
-  cf_name = g_strdup(gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(fs)));
+  cf_name = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(fs));
 
   /* Perhaps the user specified a directory instead of a file.
      Check whether they did. */
@@ -1715,8 +1715,7 @@ file_color_export_ok_cb(GtkWidget *w, gpointer filter_list) {
       /* XXX - as we cannot start a new event loop (using gtk_dialog_run()),
        * as this will prevent the user from closing the now existing error
        * message, simply close the dialog (this is the best we can do here). */
-      if (file_save_as_w)
-        window_destroy(GTK_WIDGET (fs));
+       window_destroy(GTK_WIDGET (fs));
 
        return;
    }