merge_all_tap_menus() has been moved to menus.c.

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

diff --git a/gtk/fileset_dlg.c b/gtk/fileset_dlg.c
index 72167c982157dcc54afc02c9c64d1d1040538083..c2900f4cf6f834e2a26b4d6dc5d0adc7d0f80b48 100644 (file)
--- a/gtk/fileset_dlg.c
+++ b/gtk/fileset_dlg.c
@@ -36,7 +36,6 @@
 
 #include <epan/filesystem.h>
 
-#include "../globals.h"
 #include "../simple_dialog.h"
 #include "../fileset.h"
 
@@ -60,13 +59,12 @@ static GtkWidget *fs_w;
 
 
 /* various widget related global data */
-int           row;
-GtkWidget     *fs_tb;
-GtkWidget     *fs_sw;
-GtkTooltips   *tooltips;
-GtkWidget     *fs_dir_lb;
-GtkWidget     *fs_first_rb;
-GtkWidget     *fs_tb_vb;
+static int            row;
+static GtkWidget     *fs_tb;
+static GtkWidget     *fs_sw;
+static GtkWidget     *fs_dir_lb;
+static GtkWidget     *fs_first_rb;
+static GtkWidget     *fs_tb_vb;
 
 
 
@@ -84,7 +82,7 @@ fs_open_entry(fileset_entry *entry)
     /* close the old and open the new file */
     cf_close(&cfile);
     if (cf_open(&cfile, fname, FALSE, &err) == CF_OK) {
-        cf_read(&cfile);
+        cf_read(&cfile, FALSE);
     }
 
     g_free(fname);
@@ -168,13 +166,13 @@ fileset_dlg_add_file(fileset_entry *entry) {
                /* if this file doesn't follow the file set pattern, */
                /* use the creation time of that file */
                local = localtime(&entry->ctime);
-               created = g_strdup_printf("%04u.%02u.%02u %02u:%02u:%02u", 
+               created = g_strdup_printf("%04u.%02u.%02u %02u:%02u:%02u",
                        local->tm_year+1900, local->tm_mon+1, local->tm_mday,
                        local->tm_hour, local->tm_min, local->tm_sec);
        }
 
     local = localtime(&entry->mtime);
-    modified = g_strdup_printf("%04u.%02u.%02u %02u:%02u:%02u", 
+    modified = g_strdup_printf("%04u.%02u.%02u %02u:%02u:%02u",
         local->tm_year+1900, local->tm_mon+1, local->tm_mday,
         local->tm_hour, local->tm_min, local->tm_sec);
     size = g_strdup_printf("%" G_GINT64_MODIFIER "d Bytes", entry->size);
@@ -187,7 +185,7 @@ fileset_dlg_add_file(fileset_entry *entry) {
     if(entry->current) {
         gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (fs_rb), entry->current);
     }
-    gtk_tooltips_set_tip(tooltips, fs_rb, "Open this capture file", NULL);
+       gtk_widget_set_tooltip_text(fs_rb, "Open this capture file");
     gtk_table_attach_defaults(GTK_TABLE(fs_tb), fs_rb, 0, 1, row, row+1);
     g_signal_connect(fs_rb, "toggled", G_CALLBACK(fs_rb_cb), entry);
     gtk_widget_show(fs_rb);
@@ -222,15 +220,20 @@ fileset_dlg_add_file(fileset_entry *entry) {
     if(row <= 18) {
       GtkRequisition requisition;
 
+#if GTK_CHECK_VERSION(3,0,0)
+         gtk_widget_get_preferred_size(fs_tb, &requisition, NULL);
+#else
       gtk_widget_size_request(fs_tb, &requisition);
+#endif
+         /* XXX use gtk_window_set_default_size()? */
       gtk_widget_set_size_request(fs_sw, -1, requisition.height);
       gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(fs_sw), GTK_POLICY_NEVER, GTK_POLICY_NEVER);
     }
-    
+
     if(row == 18) {
       gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(fs_sw), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
     }
-    
+
     row++;
 
     g_free(created);
@@ -245,7 +248,7 @@ fileset_init_table(GtkWidget *parent)
 {
   GtkWidget     *fs_lb;
 
-  
+
   fs_tb = gtk_table_new(6,1, FALSE);
   gtk_table_set_row_spacings(GTK_TABLE(fs_tb), 1);
   gtk_table_set_col_spacings(GTK_TABLE(fs_tb), 12);
@@ -292,8 +295,6 @@ fileset_cb(GtkWidget *w _U_, gpointer d _U_)
   fs_w = dlg_window_new("");  /* transient_for top_level */
   gtk_window_set_destroy_with_parent (GTK_WINDOW(fs_w), TRUE);
 
-  tooltips = gtk_tooltips_new();
-
   main_vb = gtk_vbox_new(FALSE, 5);
   gtk_container_set_border_width(GTK_CONTAINER(main_vb), 5);
   gtk_container_add(GTK_CONTAINER(fs_w), main_vb);
@@ -317,7 +318,7 @@ fileset_cb(GtkWidget *w _U_, gpointer d _U_)
 
   close_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLOSE);
   window_set_cancel_button(fs_w, close_bt, window_cancel_button_cb);
-  gtk_tooltips_set_tip(tooltips, close_bt, "Close this window.", NULL);
+  gtk_widget_set_tooltip_text(close_bt, "Close this window.");
 
   help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
   g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_FILESET_DIALOG);
@@ -372,7 +373,7 @@ fileset_file_opened(const char *fname) {
   }
 
   /* update the menu */
-  set_menus_for_file_set(TRUE /* file_set */, 
+  set_menus_for_file_set(TRUE /* file_set */,
       fileset_get_previous() != NULL, fileset_get_next() != NULL );
 }
 
@@ -393,7 +394,7 @@ fileset_file_closed(void)
   }
 
   /* update the menu */
-  set_menus_for_file_set(FALSE /* file_set */, 
+  set_menus_for_file_set(FALSE /* file_set */,
                          fileset_get_previous() != NULL,
                          fileset_get_next() != NULL );
 }