[Commits] [SCM] claws branch, gtk3, updated. 4.0.0-75-g781785c94
paul at claws-mail.org
paul at claws-mail.org
Mon Aug 23 17:47:54 UTC 2021
The branch, gtk3 has been updated
via 781785c94b1b19c6ee3fa5228d91b11fd1262bcd (commit)
from 97515cb7f1601c688e5badce1274b0366ddcacd0 (commit)
Summary of changes:
src/gtk/gtkshruler.c | 8 --------
src/plugins/notification/gtkhotkey/gtk-hotkey-info.c | 9 ---------
src/plugins/python/python-shell.c | 8 --------
3 files changed, 25 deletions(-)
- Log -----------------------------------------------------------------
commit 781785c94b1b19c6ee3fa5228d91b11fd1262bcd
Author: paul <paul at claws-mail.org>
Date: Mon Aug 23 18:47:50 2021 +0100
remove these unnecessary GLIB_CHECK_VERSIONs
available since 2.4 but deprecated in 2.58; we require 2.28 as a minimum
diff --git a/src/gtk/gtkshruler.c b/src/gtk/gtkshruler.c
index 01d2b0b20..31ddd3ed9 100644
--- a/src/gtk/gtkshruler.c
+++ b/src/gtk/gtkshruler.c
@@ -171,12 +171,8 @@ static void gtk_shruler_make_pixmap (GtkSHRuler *ruler);
static PangoLayout * gtk_shruler_get_layout (GtkWidget *widget,
const gchar *text);
-#if !GLIB_CHECK_VERSION(2, 58, 0)
-G_DEFINE_TYPE (GtkSHRuler, gtk_shruler, GTK_TYPE_WIDGET)
-#else
G_DEFINE_TYPE_WITH_CODE (GtkSHRuler, gtk_shruler, GTK_TYPE_WIDGET,
G_ADD_PRIVATE(GtkSHRuler))
-#endif
#define parent_class gtk_shruler_parent_class
@@ -202,10 +198,6 @@ gtk_shruler_class_init (GtkSHRulerClass *klass)
widget_class->motion_notify_event = gtk_shruler_motion_notify;
widget_class->draw = gtk_shruler_expose;
-#if !GLIB_CHECK_VERSION(2, 58, 0)
- g_type_class_add_private (object_class, sizeof (GtkSHRulerPrivate));
-#endif
-
g_object_class_install_property (object_class,
PROP_ORIENTATION,
g_param_spec_enum ("orientation",
diff --git a/src/plugins/notification/gtkhotkey/gtk-hotkey-info.c b/src/plugins/notification/gtkhotkey/gtk-hotkey-info.c
index 88805f38e..672da8b9d 100644
--- a/src/plugins/notification/gtkhotkey/gtk-hotkey-info.c
+++ b/src/plugins/notification/gtkhotkey/gtk-hotkey-info.c
@@ -50,12 +50,8 @@ guint info_signals[LAST_SIGNAL] = { 0 };
static void gtk_hotkey_info_finalize (GObject * obj);
-#if !GLIB_CHECK_VERSION(2, 58, 0)
-G_DEFINE_TYPE(GtkHotkeyInfo, gtk_hotkey_info, G_TYPE_OBJECT)
-#else
G_DEFINE_TYPE_WITH_CODE(GtkHotkeyInfo, gtk_hotkey_info, G_TYPE_OBJECT,
G_ADD_PRIVATE(GtkHotkeyInfo))
-#endif
/**
* SECTION:gtk-hotkey-info
@@ -501,11 +497,6 @@ gtk_hotkey_info_class_init (GtkHotkeyInfoClass * klass)
{
gtk_hotkey_info_parent_class = g_type_class_peek_parent (klass);
-#if !GLIB_CHECK_VERSION(2, 58, 0)
- g_type_class_add_private (G_OBJECT_CLASS (klass),
- sizeof (GtkHotkeyInfoPrivate));
-#endif
-
G_OBJECT_CLASS (klass)->get_property = gtk_hotkey_info_get_property;
G_OBJECT_CLASS (klass)->set_property = gtk_hotkey_info_set_property;
G_OBJECT_CLASS (klass)->finalize = gtk_hotkey_info_finalize;
diff --git a/src/plugins/python/python-shell.c b/src/plugins/python/python-shell.c
index 7a628deb5..6c26e2122 100644
--- a/src/plugins/python/python-shell.c
+++ b/src/plugins/python/python-shell.c
@@ -69,12 +69,8 @@ static gboolean parasite_python_shell_key_press_cb(GtkWidget *textview,
static GtkVBoxClass *parent_class = NULL;
//static guint signals[LAST_SIGNAL] = {0};
-#if !GLIB_CHECK_VERSION(2, 58, 0)
-G_DEFINE_TYPE(ParasitePythonShell, parasite_python_shell, GTK_TYPE_VBOX);
-#else
G_DEFINE_TYPE_WITH_CODE(ParasitePythonShell, parasite_python_shell,
GTK_TYPE_VBOX, G_ADD_PRIVATE(ParasitePythonShell))
-#endif
static void
@@ -85,10 +81,6 @@ parasite_python_shell_class_init(ParasitePythonShellClass *klass)
parent_class = g_type_class_peek_parent(klass);
object_class->finalize = parasite_python_shell_finalize;
-
-#if !GLIB_CHECK_VERSION(2, 58, 0)
- g_type_class_add_private(klass, sizeof(ParasitePythonShellPrivate));
-#endif
}
static void
-----------------------------------------------------------------------
hooks/post-receive
--
Claws Mail
More information about the Commits
mailing list