Capitalize the "P" in "Packet" in "Add or Edit Packet Comment". Add

"..." after it, as it pops up a dialog box to let you actually type in a
comment.

Add "Add or Edit Packet Comment" to the menubar's Edit menu.

svn path=/trunk/; revision=41005

6 files changed, 29 insertions, 18 deletions

diff --git a/ui/gtk/edit_packet_comment_dlg.c b/ui/gtk/edit_packet_comment_dlg.c
index e622806ccf..b546253eec 100644
--- a/ui/gtk/edit_packet_comment_dlg.c
+++ b/ui/gtk/edit_packet_comment_dlg.c
@@ -40,6 +40,7 @@
 #include "ui/gtk/help_dlg.h"
 #include "ui/gtk/main.h"
 #include "ui/gtk/menus.h"
+#include "ui/gtk/new_packet_list.h"
 #include "ui/gtk/edit_packet_comment_dlg.h"
 #include "ui/gtk/old-gtk-compat.h"
 
@@ -58,7 +59,7 @@ pkt_comment_text_buff_clear_cb(GtkWidget *w _U_, GtkWidget *view)
 
 
 void
-edit_packet_comment_dlg (GtkAction *action _U_, gpointer data)
+edit_packet_comment_dlg (GtkAction *action _U_, gpointer data _U_)
 {
 
   GtkWidget *vbox;
@@ -82,7 +83,7 @@ edit_packet_comment_dlg (GtkAction *action _U_, gpointer data)
   buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
 
   /* Get the comment */
-  opt_comment = get_packet_comment_from_packet_list_row(data);
+  opt_comment = new_packet_list_get_packet_comment();
   /*g_warning("Fetched comment '%s'",opt_comment);*/
 
   if(opt_comment){
diff --git a/ui/gtk/main.c b/ui/gtk/main.c
index 493ed30448..593c30c16d 100644
--- a/ui/gtk/main.c
+++ b/ui/gtk/main.c
@@ -629,17 +629,6 @@ get_filter_from_packet_list_row_and_column(gpointer data)
     return buf;
 }
 
-gchar *
-get_packet_comment_from_packet_list_row(gpointer data)
-{
-    gint    row = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(data), E_MPACKET_LIST_ROW_KEY));
-    frame_data *fdata;
-
-    fdata = (frame_data *) new_packet_list_get_row_data(row);
-
-	return fdata->opt_comment;
-}
-
 void
 match_selected_plist_cb(GtkWidget *w _U_, gpointer data, MATCH_SELECTED_E action)
 {
diff --git a/ui/gtk/main.h b/ui/gtk/main.h
index 091004ae58..e86d1c0f0f 100644
--- a/ui/gtk/main.h
+++ b/ui/gtk/main.h
@@ -350,9 +350,6 @@ extern void redissect_packets(void);
 /** Fetch all IP addresses from selected row */
 extern GList *get_ip_address_list_from_packet_list_row(gpointer data);
 
-/** Fetch packet comment from selected row */
-extern gchar *get_packet_comment_from_packet_list_row(gpointer data);
-
 extern GtkWidget *pkt_scrollw;
 
 void hide_interface(gchar* new_hide);
diff --git a/ui/gtk/main_menubar.c b/ui/gtk/main_menubar.c
index 0b6aaf4543..06fac658ae 100644
--- a/ui/gtk/main_menubar.c
+++ b/ui/gtk/main_menubar.c
@@ -1054,6 +1054,7 @@ static const char *ui_desc_menubar =
 "        <menuitem name='TimeShift' action='/Edit/TimeShift'/>\n"
 "        <separator/>\n"
 "        <menuitem name='EditPacket' action='/Edit/EditPacket'/>\n"
+"        <menuitem name='AddEditPktComment' action='/Edit/AddEditPktComment'/>\n"
 "        <separator/>\n"
 "        <menuitem name='ConfigurationProfiles' action='/Edit/ConfigurationProfiles'/>\n"
 "        <menuitem name='Preferences' action='/Edit/Preferences'/>\n"
@@ -1557,6 +1558,7 @@ static const GtkActionEntry main_menu_bar_entries[] = {
    { "/Edit/ConfigurationProfiles", NULL,                   "_Configuration Profiles...",           "<shift><control>A",        NULL,           G_CALLBACK(profile_dialog_cb) },
    { "/Edit/Preferences",           GTK_STOCK_PREFERENCES,  "_Preferences...",                      "<shift><control>P",        NULL,           G_CALLBACK(menus_prefs_cb) },
    { "/Edit/EditPacket",                NULL,               "_Edit Packet",                         NULL,                       NULL,           G_CALLBACK(edit_window_cb) },
+   { "/Edit/AddEditPktComment",         WIRESHARK_STOCK_EDIT,   "Edit or Add Packet Comment...",   NULL,                   NULL,           G_CALLBACK(edit_packet_comment_dlg) },
 
    { "/View/TimeDisplayFormat",     NULL,                   "_Time Display Format",                 NULL,                       NULL,           NULL },
 
@@ -2734,7 +2736,7 @@ static const GtkActionEntry packet_list_menu_popup_action_entries[] = {
   { "/TimeShift",                       WIRESHARK_STOCK_TIME,   "Time Shift...",                NULL,                   NULL,           G_CALLBACK(time_shift_cb) },
   { "/ManuallyResolveAddress",          NULL,                   "Manually Resolve Address",     NULL,                   NULL,           G_CALLBACK(manual_addr_resolv_dlg) },
   { "/Apply as Filter",                 NULL,                   "Apply as Filter",              NULL,                   NULL,           NULL },
-  { "/Edit/AddEditPktComment",          WIRESHARK_STOCK_EDIT,   "Edit or Add packet Comment",   NULL,                   NULL,           G_CALLBACK(edit_packet_comment_dlg) },
+  { "/Edit/AddEditPktComment",          WIRESHARK_STOCK_EDIT,   "Edit or Add Packet Comment...",   NULL,                   NULL,           G_CALLBACK(edit_packet_comment_dlg) },
 
   { "/Apply as Filter/Selected",        NULL, "_Selected" ,             NULL, NULL, G_CALLBACK(packet_list_menu_apply_selected_cb) },
   { "/Apply as Filter/Not Selected",    NULL, "_Not Selected",          NULL, NULL, G_CALLBACK(packet_list_menu_apply_not_selected_cb) },
@@ -4768,7 +4770,9 @@ set_menus_for_selected_packet(capture_file *cf)
     set_menu_sensitivity(ui_manager_main_menubar, "/Menubar/EditMenu/EditPacket",
                          frame_selected);
 #endif /* WANT_PACKET_EDITOR */
-   set_menu_sensitivity(ui_manager_packet_list_menu, "/PacketListMenuPopup/IgnorePacket",
+    set_menu_sensitivity(ui_manager_main_menubar, "/Menubar/EditMenu/AddEditPktComment",
+                         frame_selected);
+    set_menu_sensitivity(ui_manager_packet_list_menu, "/PacketListMenuPopup/IgnorePacket",
                          frame_selected);
     set_menu_sensitivity(ui_manager_main_menubar, "/Menubar/EditMenu/IgnoreAllDisplayedPackets",
                          cf->displayed_count > 0 && cf->displayed_count != cf->count);
diff --git a/ui/gtk/new_packet_list.c b/ui/gtk/new_packet_list.c
index 913127957a..29fbb09363 100644
--- a/ui/gtk/new_packet_list.c
+++ b/ui/gtk/new_packet_list.c
@@ -1700,6 +1700,24 @@ new_packet_list_copy_summary_cb(gpointer data _U_, copy_summary_type copy_type)
 	g_string_free(text,TRUE);
 }
 
+gchar *
+new_packet_list_get_packet_comment(void)
+{
+	GtkTreeModel *model;
+	GtkTreeSelection *selection;
+	GtkTreeIter iter;
+	PacketListRecord *record;
+
+	selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(packetlist->view));
+	/* model is filled with the current model as a convenience. */
+	if (!gtk_tree_selection_get_selected(selection, &model, &iter))
+		return NULL;
+
+	record = new_packet_list_get_record(model, &iter);
+
+	return record->fdata->opt_comment;
+}
+
 void
 new_packet_list_recent_write_all(FILE *rf)
 {
diff --git a/ui/gtk/new_packet_list.h b/ui/gtk/new_packet_list.h
index 70cf706b4b..3ba460367d 100644
--- a/ui/gtk/new_packet_list.h
+++ b/ui/gtk/new_packet_list.h
@@ -133,6 +133,8 @@ typedef enum {
  */
 void new_packet_list_copy_summary_cb(gpointer data _U_, copy_summary_type copy_type);
 
+gchar *new_packet_list_get_packet_comment(void);
+
 GtkWidget * new_packet_list_get_widget(void);
 void new_packet_list_colorize_packets(void);