Don't include "../image/eicon3d64.xpm", as we're not using it for now.

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

diff --git a/gtk/main.c b/gtk/main.c
index 8b8c0c51ce40d32383348358478f7de66ed4bf6a..e99c98f57e92fc0fcc0bff573c2d3dde433696f1 100644 (file)
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -132,7 +132,9 @@
 #include "decode_as_dlg.h"
 #include "webbrowser.h"
 #include "capture_dlg.h"
+#if 0
 #include "../image/eicon3d64.xpm"
+#endif
 #include "capture_ui_utils.h"
 
 
@@ -1620,6 +1622,9 @@ main(int argc, char *argv[])
      by preference settings and then again by the command line parameters. */
   capture_opts_init(capture_opts, &cfile);
 
+  capture_opts->snaplen             = MIN_PACKET_SIZE;
+  capture_opts->has_ring_num_files  = TRUE;
+
   command_name = get_basename(ethereal_path);
   /* Set "capture_child" to indicate whether this is going to be a child
      process for a "-S" capture. */
@@ -1874,7 +1879,7 @@ main(int argc, char *argv[])
       case 'Z':        /* Write to pipe FD XXX */
 #endif /* _WIN32 */
 #ifdef HAVE_LIBPCAP
-        capture_opt_add(capture_opts, opt, optarg, &start_capture);
+        capture_opts_add_opt(capture_opts, "ethereal", opt, optarg, &start_capture);
 #else
         capture_option_specified = TRUE;
         arg_error = TRUE;
@@ -1885,7 +1890,7 @@ main(int argc, char *argv[])
        * the error flags for the user in the non-libpcap case.
        */
       case 'W':        /* Write to capture file FD xxx */
-        capture_opt_add(capture_opts, opt, optarg, &start_capture);
+        capture_opts_add_opt(capture_opts, "ethereal", opt, optarg, &start_capture);
        break;
 #endif
 
@@ -2725,6 +2730,9 @@ is_widget_visible(GtkWidget *widget, gpointer data)
 }
 
 
+#if 0
+/* XXX - There seems to be some disagreement about if and how this feature should be implemented.
+   As I currently don't have the time to continue this, it's temporarily disabled. - ULFL */
 GtkWidget *
 welcome_item(gchar *stock_item, gchar * label, gchar * message, GtkSignalFunc callback, void *callback_data)
 {
@@ -2839,6 +2847,16 @@ welcome_new(void)
 
     return welcome_scrollw;
 }
+#endif /* 0 */
+
+GtkWidget *
+welcome_new(void)
+{
+    /* this is just a dummy to fill up window space, simply showing nothing */
+    return scrolled_window_new(NULL, NULL);
+}
+
+
 
 /*
  * XXX - this doesn't appear to work with the paned widgets in