Replace "svn" with "git" all over the place.

[metze/wireshark/wip.git] / ui / gtk / summary_dlg.c

diff --git a/ui/gtk/summary_dlg.c b/ui/gtk/summary_dlg.c
index 8941976739e1c1566081cb87604d1c4f693be241..920ece04e843b81df5516384850b18cc9f3e923e 100644 (file)
--- a/ui/gtk/summary_dlg.c
+++ b/ui/gtk/summary_dlg.c
@@ -82,6 +82,7 @@ add_string_to_grid_sensitive(GtkWidget *grid, guint *row, const gchar *title, co
     ws_gtk_grid_attach_defaults(GTK_GRID(grid), label, 0, *row, 1, 1);
 
     label = gtk_label_new(value);
+    gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
     gtk_misc_set_alignment(GTK_MISC(label), 0.0f, 0.5f);
     gtk_widget_set_sensitive(label, sensitive);
     ws_gtk_grid_attach_defaults(GTK_GRID(grid), label, 1, *row, 1, 1);
@@ -116,14 +117,6 @@ time_to_string(char *string_buff, gulong string_buff_size, time_t ti_time)
 {
   struct tm *ti_tm;
 
-#if (defined _WIN32) && (_MSC_VER < 1500)
-  /* calling localtime() on MSVC 2005 with huge values causes it to crash */
-  /* XXX - find the exact value that still does work */
-  /* XXX - using _USE_32BIT_TIME_T might be another way to circumvent this problem */
-  if (ti_time > 2000000000) {
-      ti_tm = NULL;
-  } else
-#endif
   ti_tm = localtime(&ti_time);
   if (ti_tm == NULL) {
     g_snprintf(string_buff, string_buff_size, "Not representable");
@@ -198,11 +191,7 @@ summary_open_cb(GtkWidget *w _U_, gpointer d _U_)
   double        seconds;
   double        disp_seconds;
   double        marked_seconds;
-  guint         offset;
-  guint         snip;
   guint         row;
-  gchar        *str_dup;
-  gchar        *str_work;
 
   unsigned int  elapsed_time;
   iface_options iface;
@@ -446,23 +435,7 @@ summary_open_cb(GtkWidget *w _U_, gpointer d _U_)
 
   if (summary.dfilter) {
     /* Display filter */
-    /* limit each row to some reasonable length */
-    str_dup = g_strdup_printf("%s", summary.dfilter);
-    str_work = g_strdup(str_dup);
-    offset = 0;
-    snip = 0;
-    while(strlen(str_work) > FILTER_SNIP_LEN) {
-        str_work[FILTER_SNIP_LEN] = '\0';
-        add_string_to_grid(grid, &row, (snip == 0) ? "Display filter:" : "", str_work);
-        g_free(str_work);
-        offset+=FILTER_SNIP_LEN;
-        str_work = g_strdup(&str_dup[offset]);
-        snip++;
-    }
-
-    add_string_to_grid(grid, &row, (snip == 0) ? "Display filter:" : "", str_work);
-    g_free(str_work);
-    g_free(str_dup);
+    add_string_to_grid(grid, &row, "Display filter:", summary.dfilter);
   } else {
     /* Display filter */
     add_string_to_grid(grid, &row, "Display filter:", "none");
@@ -698,7 +671,7 @@ summary_to_texbuff(GtkTextBuffer *buffer)
 #endif
 
   /* Add Wireshark version*/
-  g_snprintf(string_buff, SUM_STR_MAX, "Summary created by Wireshark %s\n\n", wireshark_svnversion);
+  g_snprintf(string_buff, SUM_STR_MAX, "Summary created by Wireshark %s\n\n", wireshark_gitversion);
   gtk_text_buffer_insert_at_cursor (buffer, string_buff, -1);
 
   /* Info about file */