fix some GTK1 related comments

svn path=/trunk/; revision=24862

6 files changed, 8 insertions, 19 deletions

diff --git a/gtk/dlg_utils.c b/gtk/dlg_utils.c
index 89ef24e5d9..47f9ce550c 100644
--- a/gtk/dlg_utils.c
+++ b/gtk/dlg_utils.c
@@ -92,8 +92,8 @@ dlg_button_focus_nth(GtkWidget *hbox, gint focus_item) {
  *
  * a.) keep the button layout more consistent over the different dialogs
  * b.) being able to switch between different button layouts, e.g.:
- *     GTK1 (e.g. win32) "OK" "Apply" "Cancel"
- *     GTK2 (e.g. GNOME) "Apply" "Cancel" "OK"
+ *     e.g. Win32: "OK" "Apply" "Cancel"
+ *     e.g. GNOME: "Apply" "Cancel" "OK"
  */
 GtkWidget *
 dlg_button_row_new(const gchar *stock_id_first, ...)
diff --git a/gtk/export_object_http.c b/gtk/export_object_http.c
index 39f1024c4e..ebfc58cf79 100644
--- a/gtk/export_object_http.c
+++ b/gtk/export_object_http.c
@@ -32,8 +32,7 @@
 #include <glib.h>
 #include <gtk/gtk.h>
 
-/* This feature has not been ported to GTK1 and uses some functions only
- * only available in GTK 2.4 and above. */
+/* This feature uses some functions only available in GTK 2.4 and above. */
 #if GTK_CHECK_VERSION(2,4,0)
 
 #include <epan/dissectors/packet-http.h>
diff --git a/gtk/main.c b/gtk/main.c
index 2777f9c6dc..ad9708aed4 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -1417,7 +1417,7 @@ update_cb(gpointer data _U_)
 #else
 
 /* if these three functions are copied to gtk1 Wireshark, since gtk1 does not
-   use threads all updte_thread_mutex can be dropped and protect/unprotect
+   use threads all update_thread_mutex can be dropped and protect/unprotect
    would just be empty functions.
 
    This allows gtk2-rpcstat.c and friends to be copied unmodified to
@@ -2590,10 +2590,10 @@ main(int argc, char *argv[])
       ut=g_thread_create(update_thread, NULL, FALSE, NULL);
       g_thread_set_priority(ut, G_THREAD_PRIORITY_LOW);
   }
-#else  /* _WIN32 || GTK1.2 || !G_THREADS_ENABLED || !USE_THREADS */
+#else  /* !_WIN32 && G_THREADS_ENABLED && USE_THREADS */
   /* this is to keep tap extensions updating once every 3 seconds */
   gtk_timeout_add(3000, (GtkFunction)update_cb,(gpointer)NULL);
-#endif /* !_WIN32 && GTK2 && G_THREADS_ENABLED */
+#endif /* !_WIN32 && G_THREADS_ENABLED && USE_THREADS */
 
 #if HAVE_GNU_ADNS
   gtk_timeout_add(750, (GtkFunction) host_name_lookup_process, NULL);
diff --git a/gtk/mgcp_stat.c b/gtk/mgcp_stat.c
index 7fe9f62a0d..b2f6e26716 100644
--- a/gtk/mgcp_stat.c
+++ b/gtk/mgcp_stat.c
@@ -193,7 +193,6 @@ mgcpstat_draw(void *pms)
 {
 	mgcpstat_t *ms=(mgcpstat_t *)pms;
 	int i;
-	/* gtk1 using a scrollable clist*/
 	char *str[7];
 
 	for(i=0;i<7;i++) {
@@ -279,8 +278,7 @@ gtk_mgcpstat_init(const char *optarg, void *userdata _U_)
 
 	init_main_stat_window(ms->win, ms->vbox, "MGCP Service Response Time (SRT) Statistics", filter);
 
-	/* GTK1 using a scrollable clist*/
-        /* init a scrolled window*/
+	/* init a scrolled window*/
 	ms->scrolled_window = scrolled_window_new(NULL, NULL);
 
 	ms->table = create_stat_table(ms->scrolled_window, ms->vbox, 7, titles);
diff --git a/gtk/radius_stat.c b/gtk/radius_stat.c
index 700cddd997..80c04338ae 100644
--- a/gtk/radius_stat.c
+++ b/gtk/radius_stat.c
@@ -228,7 +228,6 @@ radiusstat_draw(void *prs)
 {
 	radiusstat_t *rs=(radiusstat_t *)prs;
 	int i;
-	/* gtk1 using a scrollable clist*/
 	char *str[NUM_COLUMNS];
 
 	for(i=0;i<NUM_COLUMNS;i++) {
@@ -325,8 +324,7 @@ gtk_radiusstat_init(const char *optarg, void *userdata _U_)
 
 	init_main_stat_window(rs->win, rs->vbox, "RADIUS Service Response Time (SRT) Statistics", filter);
 
-	/* GTK1 using a scrollable clist*/
-        /* init a scrolled window*/
+	/* init a scrolled window*/
 	rs->scrolled_window = scrolled_window_new(NULL, NULL);
 
 	rs->table = create_stat_table(rs->scrolled_window, rs->vbox, NUM_COLUMNS, titles);
diff --git a/gtk/recent.c b/gtk/recent.c
index 0e482b93f0..8e0cdb3d79 100644
--- a/gtk/recent.c
+++ b/gtk/recent.c
@@ -245,28 +245,24 @@ write_recent(void)
 		  recent.gui_geometry_main_maximized == TRUE ? "TRUE" : "FALSE");
 
   fprintf(rf, "\n# Main window upper (or leftmost) pane size.\n");
-  fprintf(rf, "# (GTK1: has no effect here, command line -o usage only).\n");
   fprintf(rf, "# Decimal number.\n");
   if (recent.gui_geometry_main_upper_pane != 0) {
     fprintf(rf, RECENT_GUI_GEOMETRY_MAIN_UPPER_PANE ": %d\n",
 		  recent.gui_geometry_main_upper_pane);
   }
   fprintf(rf, "\n# Main window middle pane size.\n");
-  fprintf(rf, "# (GTK1: has no effect here, command line -o usage only).\n");
   fprintf(rf, "# Decimal number.\n");
   if (recent.gui_geometry_main_lower_pane != 0) {
     fprintf(rf, RECENT_GUI_GEOMETRY_MAIN_LOWER_PANE ": %d\n",
 		  recent.gui_geometry_main_lower_pane);
   }
   fprintf(rf, "\n# Statusbar left pane size.\n");
-  fprintf(rf, "# (GTK1: has no effect here, command line -o usage only).\n");
   fprintf(rf, "# Decimal number.\n");
   if (recent.gui_geometry_status_pane_left != 0) {
     fprintf(rf, RECENT_GUI_GEOMETRY_STATUS_PANE_LEFT ": %d\n",
 		  recent.gui_geometry_status_pane_left);
   }
   fprintf(rf, "\n# Statusbar middle pane size.\n");
-  fprintf(rf, "# (GTK1: has no effect here, command line -o usage only).\n");
   fprintf(rf, "# Decimal number.\n");
   if (recent.gui_geometry_status_pane_right != 0) {
     fprintf(rf, RECENT_GUI_GEOMETRY_STATUS_PANE_RIGHT ": %d\n",
@@ -600,8 +596,6 @@ recent_read_static(char **rf_path_return, int *rf_errno_return)
   recent.gui_geometry_status_pane_left  = (DEF_WIDTH/3);
   recent.gui_geometry_status_pane_right = (DEF_WIDTH/3);
 
-  /* the following are only used if GTK2 is used (as GTK1 cannot read these geometry values) */
-  /* or if set through command line */
   recent.has_gui_geometry_main_upper_pane = TRUE;
   recent.has_gui_geometry_main_lower_pane = TRUE;
   recent.has_gui_geometry_status_pane = TRUE;