code cleanup: use the prefix packet_list_ for every function mentioned in packet_list.h

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@16027 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/gtk/font_utils.c b/gtk/font_utils.c
index 9cc8f610c2d166d1e05024fe0c03a8c5caae3549..6954d5341507c91b31426b15b397b5d3ccd52017 100644 (file)
--- a/gtk/font_utils.c
+++ b/gtk/font_utils.c
@@ -535,7 +535,7 @@ user_font_apply(void) {
     }
 
     /* the font(s) seem to be ok */
-    set_plist_font(new_r_font);
+    packet_list_set_font(new_r_font);
     set_ptree_font_all(new_r_font);
     old_r_font = m_r_font;
     old_b_font = m_b_font;

diff --git a/gtk/gui_prefs.c b/gtk/gui_prefs.c
index 7d2e7a378bfe434a3cfb1e5be50e11a8d3fdbf95..daa774e7d51b52817032475fed75463868a01a55 100644 (file)
--- a/gtk/gui_prefs.c
+++ b/gtk/gui_prefs.c
@@ -540,7 +540,7 @@ gui_prefs_apply(GtkWidget *w _U_)
        toolbar_redraw_all();
        
        set_scrollbar_placement_all();
-       set_plist_sel_browse(prefs.gui_plist_sel_browse);
+       packet_list_set_sel_browse(prefs.gui_plist_sel_browse);
        set_ptree_sel_browse_all(prefs.gui_ptree_sel_browse);
        set_tree_styles_all();
     main_widgets_rearrange();

diff --git a/gtk/menu.c b/gtk/menu.c
index 59b2bec08328012034b7157c784935a405e7603d..1d69b863ac6ba72b94bfa83232a7b4653aa23615 100644 (file)
--- a/gtk/menu.c
+++ b/gtk/menu.c
@@ -235,11 +235,11 @@ static GtkItemFactoryEntry menu_items[] =
                         REFTIME_TOGGLE, ETHEREAL_STOCK_TIME),
     ITEM_FACTORY_ENTRY("/Edit/Time Reference/Find Next", NULL, reftime_frame_cb, REFTIME_FIND_NEXT, NULL, NULL),
     ITEM_FACTORY_ENTRY("/Edit/Time Reference/Find Previous", NULL, reftime_frame_cb, REFTIME_FIND_PREV, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Edit/_Mark Packet (toggle)", "<control>M", mark_frame_cb,
+    ITEM_FACTORY_ENTRY("/Edit/_Mark Packet (toggle)", "<control>M", packet_list_mark_frame_cb,
                        0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Edit/Mark _All Packets", NULL, mark_all_frames_cb,
+    ITEM_FACTORY_ENTRY("/Edit/Mark _All Packets", NULL, packet_list_mark_all_frames_cb,
                        0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Edit/_Unmark All Packets", NULL, unmark_all_frames_cb,
+    ITEM_FACTORY_ENTRY("/Edit/_Unmark All Packets", NULL, packet_list_unmark_all_frames_cb,
                        0, NULL, NULL),
     ITEM_FACTORY_ENTRY("/Edit/<separator>", NULL, NULL, 0, "<Separator>", NULL),
     ITEM_FACTORY_STOCK_ENTRY("/Edit/_Preferences...", "<shift><control>P", prefs_cb,
@@ -420,7 +420,7 @@ static int nmenu_items = sizeof(menu_items) / sizeof(menu_items[0]);
 /* packet list popup */
 static GtkItemFactoryEntry packet_list_menu_items[] =
 {
-    ITEM_FACTORY_ENTRY("/Mark Packet (toggle)", NULL, mark_frame_cb, 0, NULL, NULL),
+    ITEM_FACTORY_ENTRY("/Mark Packet (toggle)", NULL, packet_list_mark_frame_cb, 0, NULL, NULL),
     ITEM_FACTORY_ENTRY("/Time Reference", NULL, NULL, 0, "<Branch>", NULL),
     ITEM_FACTORY_STOCK_ENTRY("/Time Reference/Set Time Reference (toggle)", NULL, reftime_frame_cb, REFTIME_TOGGLE, ETHEREAL_STOCK_TIME),
     ITEM_FACTORY_ENTRY("/Time Reference/Find Next", NULL, reftime_frame_cb, REFTIME_FIND_NEXT, NULL, NULL),

diff --git a/gtk/packet_list.c b/gtk/packet_list.c
index dfb47c3ec6fda622f91e08b58bf0d17eeca6944b..a9865f3dbc4bec8a536fc308ca72af8904d32ec2 100644 (file)
--- a/gtk/packet_list.c
+++ b/gtk/packet_list.c
@@ -318,7 +318,7 @@ static void mark_frames_ready(void) {
   packets_bar_update();
 }
 
-void mark_frame_cb(GtkWidget *w _U_, gpointer data _U_) {
+void packet_list_mark_frame_cb(GtkWidget *w _U_, gpointer data _U_) {
   if (cfile.current_frame) {
     /* XXX hum, should better have a "cfile->current_row" here ... */
     set_frame_mark(!cfile.current_frame->flags.marked,
@@ -341,7 +341,7 @@ static void mark_all_frames(gboolean set) {
   mark_frames_ready();
 }
 
-void update_marked_frames(void) {
+void packet_list_update_marked_frames(void) {
   frame_data *fdata;
 
   if (cfile.plist == NULL) return;
@@ -357,11 +357,11 @@ void update_marked_frames(void) {
   mark_frames_ready();
 }
 
-void mark_all_frames_cb(GtkWidget *w _U_, gpointer data _U_) {
+void packet_list_mark_all_frames_cb(GtkWidget *w _U_, gpointer data _U_) {
   mark_all_frames(TRUE);
 }
 
-void unmark_all_frames_cb(GtkWidget *w _U_, gpointer data _U_) {
+void packet_list_unmark_all_frames_cb(GtkWidget *w _U_, gpointer data _U_) {
   mark_all_frames(FALSE);
 }
 
@@ -419,7 +419,7 @@ packet_list_button_pressed_cb(GtkWidget *w, GdkEvent *event, gpointer data _U_)
 
 /* Set the selection mode of the packet list window. */
 void
-set_plist_sel_browse(gboolean val)
+packet_list_set_sel_browse(gboolean val)
 {
         GtkSelectionMode new_mode;
         /* initialize with a mode we don't use, so that the mode == new_mode
@@ -457,7 +457,7 @@ set_plist_sel_browse(gboolean val)
 
 /* Set the font of the packet list window. */
 void
-set_plist_font(FONT_TYPE *font)
+packet_list_set_font(FONT_TYPE *font)
 {
        int i;
        gint col_width;
@@ -519,8 +519,8 @@ packet_list_new(e_prefs *prefs)
     /* Column titles are filled in below */
     gtk_container_add(GTK_CONTAINER(pkt_scrollw), packet_list);
 
-    set_plist_sel_browse(prefs->gui_plist_sel_browse);
-    set_plist_font(user_font_get_regular());
+    packet_list_set_sel_browse(prefs->gui_plist_sel_browse);
+    packet_list_set_font(user_font_get_regular());
     gtk_widget_set_name(packet_list, "packet list");
     SIGNAL_CONNECT(packet_list, "select-row", packet_list_select_cb, NULL);
     SIGNAL_CONNECT(packet_list, "unselect-row", packet_list_unselect_cb, NULL);

diff --git a/gtk/packet_list.h b/gtk/packet_list.h
index fbbbae06d73f2bea0695039c216ca566b1735a46..3953017e3592218ca760f46f49519914bbcc2fd2 100644 (file)
--- a/gtk/packet_list.h
+++ b/gtk/packet_list.h
@@ -56,24 +56,24 @@ extern void packet_list_resize_columns_cb(GtkWidget *widget, gpointer data);
  * @param widget parent widget (unused)
  * @param data unused
  */
-extern void mark_frame_cb(GtkWidget *widget, gpointer data);
+extern void packet_list_mark_frame_cb(GtkWidget *widget, gpointer data);
 
 /** Mark all packets in the list.
  * 
  * @param widget parent widget (unused)
  * @param data unused
  */
-extern void mark_all_frames_cb(GtkWidget *widget, gpointer data);
+extern void packet_list_mark_all_frames_cb(GtkWidget *widget, gpointer data);
 
 /** Unmark all packets in the list.
  * 
  * @param widget parent widget (unused)
  * @param data unused
  */
-extern void unmark_all_frames_cb(GtkWidget *widget, gpointer data);
+extern void packet_list_unmark_all_frames_cb(GtkWidget *widget, gpointer data);
 
 /** Update packet marks. */
-extern void update_marked_frames(void);
+extern void packet_list_update_marked_frames(void);
 
 /** Gdk button click appeared, get row and column number in packet list from that position.
  * 
@@ -90,12 +90,12 @@ extern gboolean packet_list_get_event_row_column(GtkWidget *widget,
  *
  * @param font the new font
  */
-extern void set_plist_font(FONT_TYPE *font);
+extern void packet_list_set_font(FONT_TYPE *font);
 
 /** Set the selection mode of the packet list window.
  *
  * @param val TRUE for GTK_SELECTION_SINGLE, FALSE for GTK_SELECTION_BROWSE
  */
-extern void set_plist_sel_browse(gboolean val);
+extern void packet_list_set_sel_browse(gboolean val);
 
 #endif /* __PACKET_LIST_H__ */

diff --git a/gtk/stream_prefs.c b/gtk/stream_prefs.c
index d18b2a406ff0ab3a2de6cf44bcafa0394d505afa..eb18c37e8ea487fd3a0caf48ab02f70ab3a0c34a 100644 (file)
--- a/gtk/stream_prefs.c
+++ b/gtk/stream_prefs.c
@@ -266,7 +266,7 @@ stream_prefs_apply(GtkWidget *w _U_)
 {
        follow_redraw_all();
 
-       update_marked_frames();
+       packet_list_update_marked_frames();
 }
 
 void