Merged in default (pull request #647)
Bump the gtk minimum to 3.22 and remove gtk3compat.h
Approved-by: Elliott Sales de Andrade
Approved-by: John Bailey
--- a/doc/reference/libpurple/meson.build Fri Nov 15 05:16:04 2019 -0500
+++ b/doc/reference/libpurple/meson.build Tue Nov 19 02:13:14 2019 +0000
@@ -8,7 +8,6 @@
--- a/doc/reference/pidgin/meson.build Fri Nov 15 05:16:04 2019 -0500
+++ b/doc/reference/pidgin/meson.build Tue Nov 19 02:13:14 2019 +0000
@@ -6,7 +6,6 @@
--- a/meson.build Fri Nov 15 05:16:04 2019 -0500
+++ b/meson.build Tue Nov 19 02:13:14 2019 +0000
@@ -296,14 +296,11 @@
required : get_option('introspection')).found()
conf.set('ENABLE_INTROSPECTION', enable_introspection)
-# #######################################################################
-# # Check for GTK+ 2.18 and other things used by the GTK UI
-# #######################################################################
-# #######################################################################
+####################################################################### # Check Pidgin dependencies
-# #######################################################################
+####################################################################### - gtk = dependency('gtk+-3.0', version : '>= 3.20.0')
+ gtk = dependency('gtk+-3.0', version : '>= 3.22.0') talkatu_dep = dependency('talkatu', version: '>=0.1.0', required : false)
--- a/pidgin/gtk3compat.h Fri Nov 15 05:16:04 2019 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +0,0 @@
- * Pidgin is the legal property of its developers, whose names are too numerous
- * to list here. Please refer to the COPYRIGHT file distributed with this
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
-#ifndef _PIDGINGTK3COMPAT_H_
-#define _PIDGINGTK3COMPAT_H_
- * @section_id: pidgin-gtk3compat
- * @short_description: <filename>gtk3compat.h</filename>
- * @title: GTK3 version-dependent definitions
- * This file is internal to Pidgin. Do not use!
- * Also, any public API should not depend on this file.
-#if !GTK_CHECK_VERSION(3,22,0)
-gtk_menu_popup_at_pointer(GtkMenu *menu, const GdkEvent *trigger_event)
- const GdkEventButton *event = (const GdkEventButton *)trigger_event;
- gtk_menu_popup(menu, NULL, NULL, NULL, NULL,
- event ? event->button : 0, gdk_event_get_time(event));
-gtk_popover_popup(GtkPopover *popover)
- gtk_widget_show(GTK_WIDGET(popover));
-gtk_popover_popdown(GtkPopover *popover)
- gtk_widget_hide(GTK_WIDGET(popover));
-#endif /* _PIDGINGTK3COMPAT_H_ */
--- a/pidgin/gtkaccount.c Fri Nov 15 05:16:04 2019 -0500
+++ b/pidgin/gtkaccount.c Tue Nov 19 02:13:14 2019 +0000
@@ -43,8 +43,6 @@
--- a/pidgin/gtkblist.c Fri Nov 15 05:16:04 2019 -0500
+++ b/pidgin/gtkblist.c Tue Nov 19 02:13:14 2019 +0000
@@ -70,8 +70,6 @@
--- a/pidgin/gtkcellrendererexpander.c Fri Nov 15 05:16:04 2019 -0500
+++ b/pidgin/gtkcellrendererexpander.c Tue Nov 19 02:13:14 2019 +0000
@@ -26,8 +26,6 @@
#include "gtkcellrendererexpander.h"
struct _PidginCellRendererExpander {
--- a/pidgin/gtkconv.c Fri Nov 15 05:16:04 2019 -0500
+++ b/pidgin/gtkconv.c Tue Nov 19 02:13:14 2019 +0000
@@ -70,7 +70,6 @@
#include "gtknickcolors.h"
#define GTK_TOOLTIPS_VAR gtkconv->tooltips
#define ADD_MESSAGE_HISTORY_AT_ONCE 100
--- a/pidgin/gtkdialogs.c Fri Nov 15 05:16:04 2019 -0500
+++ b/pidgin/gtkdialogs.c Tue Nov 19 02:13:14 2019 +0000
@@ -46,8 +46,6 @@
static GList *dialogwindows = NULL;
struct _PidginGroupMergeObject {
--- a/pidgin/gtkdnd-hints.c Fri Nov 15 05:16:04 2019 -0500
+++ b/pidgin/gtkdnd-hints.c Tue Nov 19 02:13:14 2019 +0000
@@ -26,8 +26,6 @@
#include <gdk-pixbuf/gdk-pixbuf.h>
--- a/pidgin/gtkdocklet.c Fri Nov 15 05:16:04 2019 -0500
+++ b/pidgin/gtkdocklet.c Tue Nov 19 02:13:14 2019 +0000
@@ -46,8 +46,6 @@
#ifndef DOCKLET_TOOLTIP_LINE_LIMIT
#define DOCKLET_TOOLTIP_LINE_LIMIT 5
--- a/pidgin/gtkmedia.c Fri Nov 15 05:16:04 2019 -0500
+++ b/pidgin/gtkmedia.c Tue Nov 19 02:13:14 2019 +0000
@@ -45,8 +45,6 @@
#include <gdk/gdkkeysyms.h>
#define PIDGIN_TYPE_MEDIA (pidgin_media_get_type())
#define PIDGIN_MEDIA(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), PIDGIN_TYPE_MEDIA, PidginMedia))
#define PIDGIN_MEDIA_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), PIDGIN_TYPE_MEDIA, PidginMediaClass))
--- a/pidgin/gtkmenutray.c Fri Nov 15 05:16:04 2019 -0500
+++ b/pidgin/gtkmenutray.c Tue Nov 19 02:13:14 2019 +0000
@@ -23,8 +23,6 @@
/******************************************************************************
*****************************************************************************/
--- a/pidgin/gtknotify.c Fri Nov 15 05:16:04 2019 -0500
+++ b/pidgin/gtknotify.c Tue Nov 19 02:13:14 2019 +0000
@@ -32,7 +32,6 @@
--- a/pidgin/gtkplugin.c Fri Nov 15 05:16:04 2019 -0500
+++ b/pidgin/gtkplugin.c Tue Nov 19 02:13:14 2019 +0000
@@ -30,8 +30,6 @@
#define PIDGIN_RESPONSE_CONFIGURE 98121
--- a/pidgin/gtkpluginpref.c Fri Nov 15 05:16:04 2019 -0500
+++ b/pidgin/gtkpluginpref.c Tue Nov 19 02:13:14 2019 +0000
@@ -30,7 +30,6 @@
#include "gtkpluginpref.h"
--- a/pidgin/gtkpounce.c Fri Nov 15 05:16:04 2019 -0500
+++ b/pidgin/gtkpounce.c Tue Nov 19 02:13:14 2019 +0000
@@ -33,7 +33,6 @@
--- a/pidgin/gtkprefs.c Fri Nov 15 05:16:04 2019 -0500
+++ b/pidgin/gtkprefs.c Tue Nov 19 02:13:14 2019 +0000
@@ -67,8 +67,6 @@
#include <libsoup/soup.h>
#define PREFS_OPTIMAL_ICON_SIZE 32
--- a/pidgin/gtkprivacy.c Fri Nov 15 05:16:04 2019 -0500
+++ b/pidgin/gtkprivacy.c Tue Nov 19 02:13:14 2019 +0000
@@ -32,8 +32,6 @@
#include "pidginaccountchooser.h"
--- a/pidgin/gtkrequest.c Fri Nov 15 05:16:04 2019 -0500
+++ b/pidgin/gtkrequest.c Tue Nov 19 02:13:14 2019 +0000
@@ -37,8 +37,6 @@
#include <gdk/gdkkeysyms.h>
--- a/pidgin/gtkroomlist.c Fri Nov 15 05:16:04 2019 -0500
+++ b/pidgin/gtkroomlist.c Tue Nov 19 02:13:14 2019 +0000
@@ -31,7 +31,6 @@
--- a/pidgin/gtksavedstatuses.c Fri Nov 15 05:16:04 2019 -0500
+++ b/pidgin/gtksavedstatuses.c Tue Nov 19 02:13:14 2019 +0000
@@ -36,8 +36,6 @@
* TODO: Should attach to the account-deleted and account-added signals
* and update the GtkListStores in any StatusEditor windows that
--- a/pidgin/gtkscrollbook.c Fri Nov 15 05:16:04 2019 -0500
+++ b/pidgin/gtkscrollbook.c Tue Nov 19 02:13:14 2019 +0000
@@ -21,8 +21,6 @@
#include "gtkscrollbook.h"
static void pidgin_scroll_book_init (PidginScrollBook *scroll_book);
static void pidgin_scroll_book_class_init (PidginScrollBookClass *klass);
static void pidgin_scroll_book_forall (GtkContainer *c,
--- a/pidgin/gtksmiley-manager.c Fri Nov 15 05:16:04 2019 -0500
+++ b/pidgin/gtksmiley-manager.c Tue Nov 19 02:13:14 2019 +0000
@@ -34,8 +34,6 @@
#include <libsoup/soup.h>
--- a/pidgin/gtkstatusbox.c Fri Nov 15 05:16:04 2019 -0500
+++ b/pidgin/gtkstatusbox.c Tue Nov 19 02:13:14 2019 +0000
@@ -55,8 +55,6 @@
#include "pidgingdkpixbuf.h"
/* Timeout for typing notifications in seconds */
--- a/pidgin/gtkutils.c Fri Nov 15 05:16:04 2019 -0500
+++ b/pidgin/gtkutils.c Tue Nov 19 02:13:14 2019 +0000
@@ -52,9 +52,6 @@
#include "pidgin/minidialog.h"
/******************************************************************************
*****************************************************************************/
@@ -1013,36 +1010,9 @@
-#if !GTK_CHECK_VERSION(3,22,0)
-pidgin_treeview_popup_menu_position_func(GtkMenu *menu,
- GtkWidget *widget = GTK_WIDGET(data);
- GtkTreeView *tv = GTK_TREE_VIEW(data);
- GtkTreeViewColumn *col;
- gdk_window_get_origin (gtk_widget_get_window(widget), x, y);
- gtk_tree_view_get_cursor (tv, &path, &col);
- gtk_tree_view_get_cell_area (tv, path, col, &rect);
- *x += rect.x+rect.width;
- *y += rect.y + rect.height;
- pidgin_menu_position_func_helper(menu, x, y, push_in, data);
pidgin_menu_popup_at_treeview_selection(GtkWidget *menu, GtkWidget *treeview)
-#if GTK_CHECK_VERSION(3,22,0)
GtkTreeViewColumn *column;
@@ -1059,11 +1029,6 @@
gtk_tree_path_free(path);
- gtk_menu_popup(GTK_MENU(menu), NULL, NULL,
- pidgin_treeview_popup_menu_position_func, treeview,
--- a/pidgin/gtkwhiteboard.c Fri Nov 15 05:16:04 2019 -0500
+++ b/pidgin/gtkwhiteboard.c Tue Nov 19 02:13:14 2019 +0000
@@ -27,7 +27,6 @@
#include "gtkwhiteboard.h"
--- a/pidgin/gtkxfer.c Fri Nov 15 05:16:04 2019 -0500
+++ b/pidgin/gtkxfer.c Tue Nov 19 02:13:14 2019 +0000
@@ -32,8 +32,6 @@
--- a/pidgin/minidialog.c Fri Nov 15 05:16:04 2019 -0500
+++ b/pidgin/minidialog.c Tue Nov 19 02:13:14 2019 +0000
@@ -23,8 +23,6 @@
#include "libpurple/prefs.h"
#include "pidgin/minidialog.h"
--- a/pidgin/pidgindebug.c Fri Nov 15 05:16:04 2019 -0500
+++ b/pidgin/pidgindebug.c Tue Nov 19 02:13:14 2019 +0000
@@ -37,8 +37,6 @@
#include <gdk/gdkkeysyms.h>
#include "pidginresources.h"
struct _PidginDebugWindow {
--- a/pidgin/pidginlog.c Fri Nov 15 05:16:04 2019 -0500
+++ b/pidgin/pidginlog.c Tue Nov 19 02:13:14 2019 +0000
@@ -35,8 +35,6 @@
#define PIDGIN_TYPE_LOG_VIEWER pidgin_log_viewer_get_type()
--- a/pidgin/plugins/contact_priority.c Fri Nov 15 05:16:04 2019 -0500
+++ b/pidgin/plugins/contact_priority.c Tue Nov 19 02:13:14 2019 +0000
@@ -20,7 +20,6 @@
--- a/pidgin/plugins/disco/gtkdisco.c Fri Nov 15 05:16:04 2019 -0500
+++ b/pidgin/plugins/disco/gtkdisco.c Tue Nov 19 02:13:14 2019 +0000
@@ -32,7 +32,6 @@
#include "pidginaccountchooser.h"
#include "pidgintooltip.h"
--- a/pidgin/plugins/gestures/gestures.c Fri Nov 15 05:16:04 2019 -0500
+++ b/pidgin/plugins/gestures/gestures.c Tue Nov 19 02:13:14 2019 +0000
@@ -26,7 +26,6 @@
--- a/pidgin/plugins/gestures/stroke-draw.c Fri Nov 15 05:16:04 2019 -0500
+++ b/pidgin/plugins/gestures/stroke-draw.c Tue Nov 19 02:13:14 2019 +0000
@@ -19,8 +19,6 @@
static void gstroke_invisible_window_init (GtkWidget *widget);
/*FIXME: Maybe these should be put in a structure, and not static...*/
static Display * gstroke_disp = NULL;
--- a/pidgin/plugins/gevolution/add_buddy_dialog.c Fri Nov 15 05:16:04 2019 -0500
+++ b/pidgin/plugins/gevolution/add_buddy_dialog.c Tue Nov 19 02:13:14 2019 +0000
@@ -22,7 +22,6 @@
--- a/pidgin/plugins/gevolution/assoc-buddy.c Fri Nov 15 05:16:04 2019 -0500
+++ b/pidgin/plugins/gevolution/assoc-buddy.c Tue Nov 19 02:13:14 2019 +0000
@@ -22,7 +22,6 @@
--- a/pidgin/plugins/gevolution/gevolution.c Fri Nov 15 05:16:04 2019 -0500
+++ b/pidgin/plugins/gevolution/gevolution.c Tue Nov 19 02:13:14 2019 +0000
@@ -29,7 +29,6 @@
--- a/pidgin/plugins/gevolution/new_person_dialog.c Fri Nov 15 05:16:04 2019 -0500
+++ b/pidgin/plugins/gevolution/new_person_dialog.c Tue Nov 19 02:13:14 2019 +0000
@@ -21,7 +21,6 @@
#include "pidginaccountchooser.h"
--- a/pidgin/plugins/imgupload.c Fri Nov 15 05:16:04 2019 -0500
+++ b/pidgin/plugins/imgupload.c Tue Nov 19 02:13:14 2019 +0000
@@ -24,7 +24,6 @@
--- a/pidgin/plugins/musicmessaging/musicmessaging.c Fri Nov 15 05:16:04 2019 -0500
+++ b/pidgin/plugins/musicmessaging/musicmessaging.c Tue Nov 19 02:13:14 2019 +0000
@@ -28,7 +28,6 @@
#include "conversation.h"
--- a/pidgin/plugins/notify.c Fri Nov 15 05:16:04 2019 -0500
+++ b/pidgin/plugins/notify.c Tue Nov 19 02:13:14 2019 +0000
@@ -93,7 +93,6 @@
--- a/pidgin/plugins/raw.c Fri Nov 15 05:16:04 2019 -0500
+++ b/pidgin/plugins/raw.c Tue Nov 19 02:13:14 2019 +0000
@@ -29,7 +29,6 @@
#include "pidginaccountchooser.h"
--- a/pidgin/plugins/screencap.c Fri Nov 15 05:16:04 2019 -0500
+++ b/pidgin/plugins/screencap.c Tue Nov 19 02:13:14 2019 +0000
@@ -26,7 +26,6 @@
--- a/pidgin/plugins/spellchk.c Fri Nov 15 05:16:04 2019 -0500
+++ b/pidgin/plugins/spellchk.c Tue Nov 19 02:13:14 2019 +0000
@@ -39,7 +39,6 @@
--- a/pidgin/plugins/ticker/gtkticker.c Fri Nov 15 05:16:04 2019 -0500
+++ b/pidgin/plugins/ticker/gtkticker.c Tue Nov 19 02:13:14 2019 +0000
@@ -24,8 +24,6 @@
--- a/pidgin/plugins/ticker/ticker.c Fri Nov 15 05:16:04 2019 -0500
+++ b/pidgin/plugins/ticker/ticker.c Tue Nov 19 02:13:14 2019 +0000
@@ -34,7 +34,6 @@
--- a/pidgin/plugins/unity.c Fri Nov 15 05:16:04 2019 -0500
+++ b/pidgin/plugins/unity.c Tue Nov 19 02:13:14 2019 +0000
@@ -21,7 +21,6 @@
#include "savedstatuses.h"
--- a/pidgin/plugins/xmppconsole/xmppconsole.c Fri Nov 15 05:16:04 2019 -0500
+++ b/pidgin/plugins/xmppconsole/xmppconsole.c Tue Nov 19 02:13:14 2019 +0000
@@ -31,8 +31,6 @@
#include <gdk/gdkkeysyms.h>
#define PLUGIN_ID "gtk-xmpp"
#define PLUGIN_DOMAIN (g_quark_from_static_string(PLUGIN_ID))