Mercurial > pidgin3 / file diff

--- a/pidgin/gtkmenutray.c	Wed Dec 16 00:35:23 2015 -0800
+++ b/pidgin/gtkmenutray.c	Sun Dec 20 20:46:34 2015 -0800
@@ -45,7 +45,6 @@
 /******************************************************************************
  * Item Stuff
  *****************************************************************************/
-#if GTK_CHECK_VERSION(3,0,0)
 static void
 pidgin_menu_tray_select(GtkMenuItem *widget) {
 	/* this may look like nothing, but it's really overriding the
@@ -60,21 +59,6 @@
 	 * overridding the select, so it makes sense to override deselect as well.
 	 */
 }
-#else
-static void
-pidgin_menu_tray_select(GtkItem *widget) {
-	/* this may look like nothing, but it's really overriding the
-	 * GtkMenuItem's select function so that it doesn't get highlighted like
-	 * a normal menu item would.
-	 */
-}
-static void
-pidgin_menu_tray_deselect(GtkItem *widget) {
-	/* Probably not necessary, but I'd rather be safe than sorry.  We're
-	 * overridding the select, so it makes sense to override deselect as well.
-	 */
-}
-#endif
 
 /******************************************************************************
  * Object Stuff
@@ -125,11 +109,7 @@
 static void
 pidgin_menu_tray_class_init(PidginMenuTrayClass *klass) {
 	GObjectClass *object_class = G_OBJECT_CLASS(klass);
-#if GTK_CHECK_VERSION(3,0,0)
 	GtkMenuItemClass *menu_item_class = GTK_MENU_ITEM_CLASS(klass);
-#else
-	GtkItemClass *menu_item_class = GTK_ITEM_CLASS(klass);
-#endif
 	GtkWidgetClass *widget_class = GTK_WIDGET_CLASS(klass);
 	GParamSpec *pspec;