diff -r 9bcf5ddff885 -r d02350b7261b pidgin/pidgindebug.c --- a/pidgin/pidgindebug.c Wed Jul 10 06:30:05 2019 +0000 +++ b/pidgin/pidgindebug.c Mon Jul 15 04:11:24 2019 -0400 @@ -64,9 +64,7 @@ gboolean paused; -#if GTK_CHECK_VERSION(3,12,0) GtkWidget *popover; -#endif gboolean invert; gboolean highlight; GRegex *regex; @@ -395,11 +393,7 @@ regex_menu_cb(GtkWidget *item, const gchar *pref) { gboolean active; -#if GTK_CHECK_VERSION(3,12,0) active = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(item)); -#else - active = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(item)); -#endif purple_prefs_set_bool(pref, active); } @@ -408,7 +402,6 @@ regex_popup_cb(GtkEntry *entry, GtkEntryIconPosition icon_pos, GdkEvent *event, PidginDebugWindow *win) { -#if GTK_CHECK_VERSION(3,12,0) GdkRectangle rect; gtk_entry_get_icon_area(entry, icon_pos, &rect); gtk_popover_set_pointing_to(GTK_POPOVER(win->popover), &rect); @@ -417,24 +410,6 @@ #else gtk_widget_show(win->popover); #endif -#else - GtkWidget *menu; - - menu = gtk_menu_new(); - pidgin_new_check_item(menu, _("Invert"), - G_CALLBACK(regex_menu_cb), - PIDGIN_PREFS_ROOT "/debug/invert", win->invert); - pidgin_new_check_item(menu, _("Highlight matches"), - G_CALLBACK(regex_menu_cb), - PIDGIN_PREFS_ROOT "/debug/highlight", win->highlight); - -#if GTK_CHECK_VERSION(3,22,0) - gtk_menu_popup_at_widget(GTK_MENU(menu), GTK_WIDGET(entry), - GDK_GRAVITY_SOUTH_WEST, GDK_GRAVITY_NORTH_WEST, event); -#else - gtk_menu_popup_at_pointer(GTK_MENU(menu), event); -#endif -#endif } static void @@ -607,11 +582,9 @@ "background-image: none;" "background-color: @success_color;" "}"; -#if GTK_CHECK_VERSION(3,12,0) GtkBuilder *builder; GtkWidget *popover_invert; GtkWidget *popover_highlight; -#endif gtk_widget_init_template(GTK_WIDGET(win)); @@ -676,7 +649,6 @@ purple_prefs_connect_callback(handle, PIDGIN_PREFS_ROOT "/debug/filterlevel", filter_level_pref_changed, win); -#if GTK_CHECK_VERSION(3,12,0) builder = gtk_builder_new_from_resource( "/im/pidgin/Pidgin/Debug/filter-popover.ui"); win->popover = GTK_WIDGET(gtk_builder_get_object(builder, @@ -701,7 +673,6 @@ PIDGIN_PREFS_ROOT "/debug/highlight"); g_object_unref(builder); -#endif } /* The *start* and *end* marks bound the beginning and end of an