remove some warnings

[obnox/wireshark/wip.git] / gtk / packet_list.c

diff --git a/gtk/packet_list.c b/gtk/packet_list.c
index 65e58bdde9a10417db9acff7e2277ca5155df650..34c97257781b6788191c66712ece599b72d84e13 100644 (file)
--- a/gtk/packet_list.c
+++ b/gtk/packet_list.c
@@ -162,6 +162,7 @@ packet_list_compare(EthCList *clist, gconstpointer  ptr1, gconstpointer  ptr2)
 
     case TS_ABSOLUTE:
     case TS_ABSOLUTE_WITH_DATE:
+    case TS_EPOCH:
       return COMPARE_TS(abs_ts);
 
     case TS_RELATIVE:
@@ -703,11 +704,16 @@ packet_list_select_row(gint row)
 static void
 packet_list_next_prev(gboolean next)
 {
+#if GTK_MAJOR_VERSION >= 2
     GtkWidget *focus = gtk_window_get_focus(GTK_WINDOW(top_level));
+#endif
     SIGNAL_EMIT_BY_NAME(packet_list, "scroll_vertical",
         next ? GTK_SCROLL_STEP_FORWARD : GTK_SCROLL_STEP_BACKWARD, 0.0);
+#if GTK_MAJOR_VERSION >= 2
     /* Set the focus back where it was */
-    gtk_window_set_focus(GTK_WINDOW(top_level), focus);
+    if (focus)
+        gtk_window_set_focus(GTK_WINDOW(top_level), focus);
+#endif
 }
 
 void