Move summary related stuff to summary_dlg

svn path=/trunk/; revision=46782

5 files changed, 92 insertions, 80 deletions

diff --git a/ui/gtk/about_dlg.c b/ui/gtk/about_dlg.c
index fa7b0cb7bb..8e67b8da6f 100644
--- a/ui/gtk/about_dlg.c
+++ b/ui/gtk/about_dlg.c
@@ -392,6 +392,7 @@ about_folders_page_new(void)
   gint i;
   gchar **resultArray;
 #endif
+  const gchar * const *dirs;
 
   scrolledwindow = scrolled_window_new(NULL, NULL);
   gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolledwindow),
@@ -429,6 +430,11 @@ about_folders_page_new(void)
         "\"dfilters\", \"preferences\", \"manuf\", ...");
   }
 
+  dirs = g_get_system_data_dirs ();
+  for (i = 0; dirs[i]; i++){
+	  g_warning("glibs data path %u %s",i+1,dirs[i]);
+  }
+
   /* system */
   constpath = get_systemfile_dir();
   about_folders_row(table, "System", constpath,
diff --git a/ui/gtk/edit_packet_comment_dlg.c b/ui/gtk/edit_packet_comment_dlg.c
index d5034c5963..35f420b1a4 100644
--- a/ui/gtk/edit_packet_comment_dlg.c
+++ b/ui/gtk/edit_packet_comment_dlg.c
@@ -47,7 +47,6 @@
 
 static GtkWidget *edit_or_add_pkt_comment_dlg = NULL;
 static GtkWidget *edit_or_add_capture_comment_dlg = NULL;
-static GtkWidget *view_capture_and_pkt_comments_dlg = NULL;
 
 static void
 pkt_comment_text_buff_ok_cb(GtkWidget *w _U_, GtkWidget *view)
@@ -99,25 +98,6 @@ capture_comment_text_buff_ok_cb(GtkWidget *w _U_, GtkWidget *view)
 
 }
 
-static void
-comment_summary_copy_to_clipboard_cb(GtkWidget *w _U_, GtkWidget *view)
-{
-  GtkTextBuffer *buffer;
-  GtkTextIter start_iter, end_iter;
-  GtkClipboard *clipboard;
-
-  buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
-
-  gtk_text_buffer_get_bounds(buffer, &start_iter, &end_iter);
-
-  gtk_text_buffer_select_range(buffer, &start_iter, &end_iter);
-
-  clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);     /* Get the default clipboard */
-  gtk_text_buffer_copy_clipboard (buffer, clipboard);
-
-  gtk_text_buffer_select_range(buffer, &end_iter, &end_iter);
-
-}
 
 void
 edit_packet_comment_dlg (GtkAction *action _U_, gpointer data _U_)
@@ -187,66 +167,7 @@ edit_packet_comment_dlg (GtkAction *action _U_, gpointer data _U_)
   gtk_widget_show (edit_or_add_pkt_comment_dlg);
 }
 
-void
-show_packet_comment_summary_dlg (GtkAction *action _U_, gpointer data _U_)
-{
-
-  GtkWidget *vbox;
-  GtkWidget *view;
-  GtkWidget *scroll;
-  GtkWidget *bbox;
-  GtkWidget *copy_bt, *cancel_bt, *help_bt;
-  GtkTextBuffer *buffer;
-
-  view_capture_and_pkt_comments_dlg = dlg_window_new ("Comments Summary");
-  gtk_widget_set_size_request (view_capture_and_pkt_comments_dlg, 700, 350);
-  gtk_window_set_resizable (GTK_WINDOW (view_capture_and_pkt_comments_dlg), TRUE);
-  gtk_container_set_border_width (GTK_CONTAINER (view_capture_and_pkt_comments_dlg), DLG_OUTER_MARGIN);
-
-  vbox = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, DLG_UNRELATED_SPACING, FALSE);
-  gtk_container_add (GTK_CONTAINER (view_capture_and_pkt_comments_dlg), vbox);
-  gtk_widget_show (vbox);
-
-  view = gtk_text_view_new ();
-  gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(view), GTK_WRAP_WORD);
-  buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
-  gtk_widget_show (view);
-
-  scroll = gtk_scrolled_window_new(NULL, NULL);
-  gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scroll),
-                  GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-  gtk_container_add(GTK_CONTAINER(scroll), view);
-  gtk_widget_show(scroll);
-  gtk_box_pack_start(GTK_BOX (vbox), scroll, TRUE, TRUE, 0);
-
-  /* Add capture summary information */
-  summary_to_texbuff(buffer);
-
-  /* Add all packet comments */
-  packet_list_return_all_comments(buffer);
-
-  /* Button row. */
-  bbox = dlg_button_row_new (GTK_STOCK_COPY, GTK_STOCK_CANCEL, GTK_STOCK_HELP, NULL);
-  gtk_box_pack_end (GTK_BOX(vbox), bbox, FALSE, FALSE, 0);
-
-  copy_bt = g_object_get_data (G_OBJECT(bbox), GTK_STOCK_COPY);
-  g_signal_connect (copy_bt, "clicked", G_CALLBACK(comment_summary_copy_to_clipboard_cb), view);
-  gtk_widget_set_sensitive (copy_bt, TRUE);
-
-  cancel_bt = g_object_get_data (G_OBJECT(bbox), GTK_STOCK_CANCEL);
-  window_set_cancel_button (view_capture_and_pkt_comments_dlg, cancel_bt, window_cancel_button_cb);
 
-  help_bt = g_object_get_data (G_OBJECT(bbox), GTK_STOCK_HELP);
-#if 0
-  g_signal_connect (help_bt, "clicked",/* G_CALLBACK(topic_cb)*/NULL, /*(gpointer)HELP_MANUAL_ADDR_RESOLVE_DIALOG*/NULL);
-#endif
-  gtk_widget_set_sensitive (help_bt, FALSE);
-
-  gtk_widget_grab_default (copy_bt);
-
-
-  gtk_widget_show (view_capture_and_pkt_comments_dlg);
-}
 
 static void
 edit_capture_comment_destroy_cb(GtkWidget *win _U_, gpointer user_data _U_)
diff --git a/ui/gtk/edit_packet_comment_dlg.h b/ui/gtk/edit_packet_comment_dlg.h
index 5612dbafbb..69040cfc8b 100644
--- a/ui/gtk/edit_packet_comment_dlg.h
+++ b/ui/gtk/edit_packet_comment_dlg.h
@@ -26,7 +26,6 @@
 #define __EDIT_PACKET_COMMENTS_H__
 
 void edit_packet_comment_dlg (GtkAction *action, gpointer data);
-void show_packet_comment_summary_dlg(GtkAction *action, gpointer data);
 void edit_capture_dlg_launch (void);
 
 #endif /* __EDIT_PACKET_COMMENTS_H__ */
diff --git a/ui/gtk/summary_dlg.c b/ui/gtk/summary_dlg.c
index a89716d79d..ef5c363215 100644
--- a/ui/gtk/summary_dlg.c
+++ b/ui/gtk/summary_dlg.c
@@ -38,6 +38,7 @@
 #include "../summary.h"
 #include "../capture-pcap-util.h"
 #include "../version_info.h"
+
 #ifdef HAVE_LIBPCAP
 #include "../capture.h"
 #include "ui/capture_globals.h"
@@ -48,12 +49,15 @@
 #include "ui/gtk/dlg_utils.h"
 #include "ui/gtk/gui_utils.h"
 #include "ui/gtk/help_dlg.h"
+#include "ui/gtk/packet_list.h"
 
 #define SUM_STR_MAX     1024
 #define FILTER_SNIP_LEN 50
 #define SHB_STR_SNIP_LEN 50
 
 static GtkWidget *summary_dlg = NULL;
+static GtkWidget *view_capture_and_pkt_comments_dlg = NULL;
+
 
 static void
 add_string_to_table_sensitive(GtkWidget *list, guint *row, const gchar *title, const gchar *value, gboolean sensitive)
@@ -904,3 +908,84 @@ summary_to_texbuff(GtkTextBuffer *buffer)
   gtk_text_buffer_insert_at_cursor (buffer, string_buff, -1);
 
 }
+
+static void
+comment_summary_copy_to_clipboard_cb(GtkWidget *w _U_, GtkWidget *view)
+{
+  GtkTextBuffer *buffer;
+  GtkTextIter start_iter, end_iter;
+  GtkClipboard *clipboard;
+
+  buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
+
+  gtk_text_buffer_get_bounds(buffer, &start_iter, &end_iter);
+
+  gtk_text_buffer_select_range(buffer, &start_iter, &end_iter);
+
+  clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);     /* Get the default clipboard */
+  gtk_text_buffer_copy_clipboard (buffer, clipboard);
+
+  gtk_text_buffer_select_range(buffer, &end_iter, &end_iter);
+
+}
+
+void
+show_packet_comment_summary_dlg (GtkAction *action _U_, gpointer data _U_)
+{
+
+  GtkWidget *vbox;
+  GtkWidget *view;
+  GtkWidget *scroll;
+  GtkWidget *bbox;
+  GtkWidget *copy_bt, *cancel_bt, *help_bt;
+  GtkTextBuffer *buffer;
+
+  view_capture_and_pkt_comments_dlg = dlg_window_new ("Comments Summary");
+  gtk_widget_set_size_request (view_capture_and_pkt_comments_dlg, 700, 350);
+  gtk_window_set_resizable (GTK_WINDOW (view_capture_and_pkt_comments_dlg), TRUE);
+  gtk_container_set_border_width (GTK_CONTAINER (view_capture_and_pkt_comments_dlg), DLG_OUTER_MARGIN);
+
+  vbox = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, DLG_UNRELATED_SPACING, FALSE);
+  gtk_container_add (GTK_CONTAINER (view_capture_and_pkt_comments_dlg), vbox);
+  gtk_widget_show (vbox);
+
+  view = gtk_text_view_new ();
+  gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(view), GTK_WRAP_WORD);
+  buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
+  gtk_widget_show (view);
+
+  scroll = gtk_scrolled_window_new(NULL, NULL);
+  gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scroll),
+                  GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+  gtk_container_add(GTK_CONTAINER(scroll), view);
+  gtk_widget_show(scroll);
+  gtk_box_pack_start(GTK_BOX (vbox), scroll, TRUE, TRUE, 0);
+
+  /* Add capture summary information */
+  summary_to_texbuff(buffer);
+
+  /* Add all packet comments */
+  packet_list_return_all_comments(buffer);
+
+  /* Button row. */
+  bbox = dlg_button_row_new (GTK_STOCK_COPY, GTK_STOCK_CANCEL, GTK_STOCK_HELP, NULL);
+  gtk_box_pack_end (GTK_BOX(vbox), bbox, FALSE, FALSE, 0);
+
+  copy_bt = g_object_get_data (G_OBJECT(bbox), GTK_STOCK_COPY);
+  g_signal_connect (copy_bt, "clicked", G_CALLBACK(comment_summary_copy_to_clipboard_cb), view);
+  gtk_widget_set_sensitive (copy_bt, TRUE);
+
+  cancel_bt = g_object_get_data (G_OBJECT(bbox), GTK_STOCK_CANCEL);
+  window_set_cancel_button (view_capture_and_pkt_comments_dlg, cancel_bt, window_cancel_button_cb);
+
+  help_bt = g_object_get_data (G_OBJECT(bbox), GTK_STOCK_HELP);
+#if 0
+  g_signal_connect (help_bt, "clicked",/* G_CALLBACK(topic_cb)*/NULL, /*(gpointer)HELP_MANUAL_ADDR_RESOLVE_DIALOG*/NULL);
+#endif
+  gtk_widget_set_sensitive (help_bt, FALSE);
+
+  gtk_widget_grab_default (copy_bt);
+
+
+  gtk_widget_show (view_capture_and_pkt_comments_dlg);
+}
\ No newline at end of file
diff --git a/ui/gtk/summary_dlg.h b/ui/gtk/summary_dlg.h
index 0b3e07b0d8..96c08a196f 100644
--- a/ui/gtk/summary_dlg.h
+++ b/ui/gtk/summary_dlg.h
@@ -38,5 +38,6 @@
  */
 void summary_open_cb(GtkWidget *widget, gpointer data);
 void summary_to_texbuff(GtkTextBuffer *buffer);
+void show_packet_comment_summary_dlg(GtkAction *action, gpointer data);
 
 #endif /* __SUMMARY_DLG_H__ */