Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package cinnamon-desktop for
openSUSE:Factory checked in at 2021-06-04 22:43:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cinnamon-desktop (Old)
and /work/SRC/openSUSE:Factory/.cinnamon-desktop.new.1898 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cinnamon-desktop"
Fri Jun 4 22:43:22 2021 rev:21 rq:897284 version:5.0.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/cinnamon-desktop/cinnamon-desktop.changes
2020-12-21 12:34:44.982881001 +0100
+++
/work/SRC/openSUSE:Factory/.cinnamon-desktop.new.1898/cinnamon-desktop.changes
2021-06-04 22:43:34.579130136 +0200
@@ -1,0 +2,12 @@
+Thu May 27 20:12:12 UTC 2021 - andy great <[email protected]>
+
+- Update to version 5.0.0.
+ * avoid deprecated g_type_class_add_private
+ * libcinnamon-desktop: Fix some various build warnings, and an
+ incorrect free.
+ * gnome-bg.c: fix a leak
+
https://gitlab.gnome.org/GNOME/gnome-desktop/-/commit/af0f0fbb835e5bb22b7bce4581d3f081462b5f5b
+ and another similar instance
+ * Always parse date/time integers in base-10
+
+-------------------------------------------------------------------
Old:
----
cinnamon-desktop-4.8.1.tar.gz
New:
----
cinnamon-desktop-5.0.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cinnamon-desktop.spec ++++++
--- /var/tmp/diff_new_pack.P8FYwe/_old 2021-06-04 22:43:35.079130688 +0200
+++ /var/tmp/diff_new_pack.P8FYwe/_new 2021-06-04 22:43:35.083130692 +0200
@@ -1,7 +1,7 @@
#
# spec file for package cinnamon-desktop
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -23,7 +23,7 @@
%define typelib typelib-1_0-CinnamonDesktop-3_0
%define typelib_cvc typelib-1_0-Cvc-1_0
Name: cinnamon-desktop
-Version: 4.8.1
+Version: 5.0.0
Release: 0
Summary: Libcinnamon-desktop API
License: GPL-2.0-or-later AND MIT
@@ -238,7 +238,7 @@
%files -n %{soname}-data
%license COPYING*
%doc AUTHORS README debian/changelog
-#%{_bindir}/cinnamon-desktop-migrate-mediakeys
+#%%{_bindir}/cinnamon-desktop-migrate-mediakeys
%{_datadir}/glib-2.0/schemas/*.xml
%{_datadir}/%{soname}/
++++++ cinnamon-desktop-4.8.1.tar.gz -> cinnamon-desktop-5.0.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-desktop-4.8.1/debian/changelog
new/cinnamon-desktop-5.0.0/debian/changelog
--- old/cinnamon-desktop-4.8.1/debian/changelog 2020-12-08 11:18:50.000000000
+0100
+++ new/cinnamon-desktop-5.0.0/debian/changelog 2021-05-27 15:59:53.000000000
+0200
@@ -1,3 +1,19 @@
+cinnamon-desktop (5.0.0) uma; urgency=medium
+
+ [ Leigh Scott ]
+ * avoid deprecated g_type_class_add_private
+
+ [ Michael Webster ]
+ * libcinnamon-desktop: Fix some various build warnings, and an incorrect
free.
+
+ [ simon ]
+ * gnome-bg.c: fix a leak
https://gitlab.gnome.org/GNOME/gnome-desktop/-/commit/af0f0fbb835e5bb22b7bce4581d3f081462b5f5b
and another similar instance
+
+ [ Joshua Peisach ]
+ * Always parse date/time integers in base-10
+
+ -- Clement Lefebvre <[email protected]> Thu, 27 May 2021 14:59:26 +0100
+
cinnamon-desktop (4.8.1) ulyssa; urgency=medium
[ sudorook ]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-desktop-4.8.1/libcinnamon-desktop/gnome-bg-crossfade.c
new/cinnamon-desktop-5.0.0/libcinnamon-desktop/gnome-bg-crossfade.c
--- old/cinnamon-desktop-4.8.1/libcinnamon-desktop/gnome-bg-crossfade.c
2020-12-08 11:18:50.000000000 +0100
+++ new/cinnamon-desktop-5.0.0/libcinnamon-desktop/gnome-bg-crossfade.c
2021-05-27 15:59:53.000000000 +0200
@@ -399,7 +399,7 @@
send_root_property_change_notification (fade);
gdk_flush ();
- gdk_error_trap_pop (); // ignore errors
+ gdk_error_trap_pop_ignored (); // ignore errors
} else {
gdk_window_invalidate_rect (fade->priv->window, NULL, FALSE);
gdk_window_process_updates (fade->priv->window, FALSE);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-desktop-4.8.1/libcinnamon-desktop/gnome-bg.c
new/cinnamon-desktop-5.0.0/libcinnamon-desktop/gnome-bg.c
--- old/cinnamon-desktop-4.8.1/libcinnamon-desktop/gnome-bg.c 2020-12-08
11:18:50.000000000 +0100
+++ new/cinnamon-desktop-5.0.0/libcinnamon-desktop/gnome-bg.c 2021-05-27
15:59:53.000000000 +0200
@@ -2999,7 +2999,7 @@
static int
parse_int (const char *text)
{
- return strtol (text, NULL, 0);
+ return strtol (text, NULL, 10);
}
static void
@@ -3360,6 +3360,7 @@
gnome_bg_changes_with_time (GnomeBG *bg)
{
SlideShow *show;
+ gboolean ret = FALSE;
g_return_val_if_fail (bg != NULL, FALSE);
@@ -3367,10 +3368,12 @@
return FALSE;
show = get_as_slideshow (bg, bg->filename);
- if (show)
- return g_queue_get_length (show->slides) > 1;
+ if (show) {
+ ret = g_queue_get_length (show->slides) > 1;
+ g_object_unref (show);
+ }
- return FALSE;
+ return ret;
}
/**
@@ -3406,8 +3409,10 @@
return NULL;
- if (frame_num < 0 || frame_num >= g_queue_get_length (show->slides))
+ if (frame_num < 0 || frame_num >= g_queue_get_length (show->slides)) {
+ g_object_unref (show);
return NULL;
+ }
i = 0;
skipped = 0;
@@ -3424,6 +3429,7 @@
}
i++;
}
+ g_object_unref (show);
if (!found)
return NULL;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-desktop-4.8.1/libcinnamon-desktop/gnome-desktop-thumbnail.c
new/cinnamon-desktop-5.0.0/libcinnamon-desktop/gnome-desktop-thumbnail.c
--- old/cinnamon-desktop-4.8.1/libcinnamon-desktop/gnome-desktop-thumbnail.c
2020-12-08 11:18:50.000000000 +0100
+++ new/cinnamon-desktop-5.0.0/libcinnamon-desktop/gnome-desktop-thumbnail.c
2021-05-27 15:59:53.000000000 +0200
@@ -494,7 +494,12 @@
priv = factory->priv;
- g_clear_pointer (&priv->thumbnailers, thumbnailer_unref);
+ if (priv->thumbnailers)
+ {
+ g_list_free_full (priv->thumbnailers, (GDestroyNotify)thumbnailer_unref);
+ priv->thumbnailers = NULL;
+ }
+
g_clear_pointer (&priv->mime_types_map, g_hash_table_destroy);
if (priv->monitors)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-desktop-4.8.1/libcinnamon-desktop/gnome-rr-config.c
new/cinnamon-desktop-5.0.0/libcinnamon-desktop/gnome-rr-config.c
--- old/cinnamon-desktop-4.8.1/libcinnamon-desktop/gnome-rr-config.c
2020-12-08 11:18:50.000000000 +0100
+++ new/cinnamon-desktop-5.0.0/libcinnamon-desktop/gnome-rr-config.c
2021-05-27 15:59:53.000000000 +0200
@@ -1469,7 +1469,7 @@
gdk_flush ();
- gdk_error_trap_pop (); // ignore errors
+ gdk_error_trap_pop_ignored (); // ignore errors
}
if (result == TRUE)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-desktop-4.8.1/libcinnamon-desktop/gnome-rr-config.h
new/cinnamon-desktop-5.0.0/libcinnamon-desktop/gnome-rr-config.h
--- old/cinnamon-desktop-4.8.1/libcinnamon-desktop/gnome-rr-config.h
2020-12-08 11:18:50.000000000 +0100
+++ new/cinnamon-desktop-5.0.0/libcinnamon-desktop/gnome-rr-config.h
2021-05-27 15:59:53.000000000 +0200
@@ -84,7 +84,7 @@
guint gnome_rr_output_info_get_product (GnomeRROutputInfo *self);
guint gnome_rr_output_info_get_serial (GnomeRROutputInfo *self);
double gnome_rr_output_info_get_aspect_ratio (GnomeRROutputInfo *self);
-char *gnome_rr_output_info_get_display_name (GnomeRROutputInfo *self);
+const char *gnome_rr_output_info_get_display_name (GnomeRROutputInfo *self);
gboolean gnome_rr_output_info_get_primary (GnomeRROutputInfo *self);
void gnome_rr_output_info_set_primary (GnomeRROutputInfo *self, gboolean
primary);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-desktop-4.8.1/libcinnamon-desktop/gnome-rr-output-info.c
new/cinnamon-desktop-5.0.0/libcinnamon-desktop/gnome-rr-output-info.c
--- old/cinnamon-desktop-4.8.1/libcinnamon-desktop/gnome-rr-output-info.c
2020-12-08 11:18:50.000000000 +0100
+++ new/cinnamon-desktop-5.0.0/libcinnamon-desktop/gnome-rr-output-info.c
2021-05-27 15:59:53.000000000 +0200
@@ -264,7 +264,7 @@
*
* Returns: (transfer none): the display name of this output
*/
-char *gnome_rr_output_info_get_display_name (GnomeRROutputInfo *self)
+const char *gnome_rr_output_info_get_display_name (GnomeRROutputInfo *self)
{
g_return_val_if_fail (GNOME_IS_RR_OUTPUT_INFO (self), NULL);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-desktop-4.8.1/libcinnamon-desktop/gnome-rr.c
new/cinnamon-desktop-5.0.0/libcinnamon-desktop/gnome-rr.c
--- old/cinnamon-desktop-4.8.1/libcinnamon-desktop/gnome-rr.c 2020-12-08
11:18:50.000000000 +0100
+++ new/cinnamon-desktop-5.0.0/libcinnamon-desktop/gnome-rr.c 2021-05-27
15:59:53.000000000 +0200
@@ -2162,7 +2162,6 @@
{
gchar *filter;
float real_scale;
- int i;
int looks_like_w, looks_like_h;
real_scale = global_scale / scale;
@@ -2762,13 +2761,6 @@
#define HIDPI_MIN_HEIGHT 1500
static gboolean
-is_logical_size_large_enough (int width,
- int height)
-{
- return height > HIDPI_MIN_SCALED_HEIGHT;
-}
-
-static gboolean
is_scale_valid_for_size (float width,
float height,
float scale)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-desktop-4.8.1/libcvc/gvc-channel-map.c
new/cinnamon-desktop-5.0.0/libcvc/gvc-channel-map.c
--- old/cinnamon-desktop-4.8.1/libcvc/gvc-channel-map.c 2020-12-08
11:18:50.000000000 +0100
+++ new/cinnamon-desktop-5.0.0/libcvc/gvc-channel-map.c 2021-05-27
15:59:53.000000000 +0200
@@ -30,8 +30,6 @@
#include "gvc-channel-map.h"
#include "gvc-channel-map-private.h"
-#define GVC_CHANNEL_MAP_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o),
GVC_TYPE_CHANNEL_MAP, GvcChannelMapPrivate))
-
struct GvcChannelMapPrivate
{
pa_channel_map pa_map;
@@ -51,7 +49,7 @@
static void gvc_channel_map_finalize (GObject *object);
-G_DEFINE_TYPE (GvcChannelMap, gvc_channel_map, G_TYPE_OBJECT)
+G_DEFINE_TYPE_WITH_PRIVATE (GvcChannelMap, gvc_channel_map, G_TYPE_OBJECT)
guint
gvc_channel_map_get_num_channels (const GvcChannelMap *map)
@@ -277,8 +275,6 @@
NULL, NULL,
g_cclosure_marshal_VOID__BOOLEAN,
G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
-
- g_type_class_add_private (klass, sizeof (GvcChannelMapPrivate));
}
void
@@ -305,7 +301,7 @@
static void
gvc_channel_map_init (GvcChannelMap *map)
{
- map->priv = GVC_CHANNEL_MAP_GET_PRIVATE (map);
+ map->priv = gvc_channel_map_get_instance_private (map);
map->priv->pa_volume_is_set = FALSE;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-desktop-4.8.1/libcvc/gvc-mixer-card.c
new/cinnamon-desktop-5.0.0/libcvc/gvc-mixer-card.c
--- old/cinnamon-desktop-4.8.1/libcvc/gvc-mixer-card.c 2020-12-08
11:18:50.000000000 +0100
+++ new/cinnamon-desktop-5.0.0/libcvc/gvc-mixer-card.c 2021-05-27
15:59:53.000000000 +0200
@@ -34,8 +34,6 @@
#include "gvc-mixer-card.h"
#include "gvc-mixer-card-private.h"
-#define GVC_MIXER_CARD_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o),
GVC_TYPE_MIXER_CARD, GvcMixerCardPrivate))
-
static guint32 card_serial = 1;
struct GvcMixerCardPrivate
@@ -67,7 +65,7 @@
static void gvc_mixer_card_finalize (GObject *object);
-G_DEFINE_TYPE (GvcMixerCard, gvc_mixer_card, G_TYPE_OBJECT)
+G_DEFINE_TYPE_WITH_PRIVATE (GvcMixerCard, gvc_mixer_card, G_TYPE_OBJECT)
static guint32
get_next_card_serial (void)
@@ -509,14 +507,12 @@
"Name of current
profile for this card in human readable form",
NULL,
G_PARAM_READABLE));
-
- g_type_class_add_private (klass, sizeof (GvcMixerCardPrivate));
}
static void
gvc_mixer_card_init (GvcMixerCard *card)
{
- card->priv = GVC_MIXER_CARD_GET_PRIVATE (card);
+ card->priv = gvc_mixer_card_get_instance_private (card);
}
GvcMixerCard *
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-desktop-4.8.1/libcvc/gvc-mixer-control.c
new/cinnamon-desktop-5.0.0/libcvc/gvc-mixer-control.c
--- old/cinnamon-desktop-4.8.1/libcvc/gvc-mixer-control.c 2020-12-08
11:18:50.000000000 +0100
+++ new/cinnamon-desktop-5.0.0/libcvc/gvc-mixer-control.c 2021-05-27
15:59:53.000000000 +0200
@@ -50,8 +50,6 @@
#include "gvc-mixer-control-private.h"
#include "gvc-mixer-ui-device.h"
-#define GVC_MIXER_CONTROL_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o),
GVC_TYPE_MIXER_CONTROL, GvcMixerControlPrivate))
-
#define RECONNECT_DELAY 5
enum {
@@ -134,7 +132,7 @@
static void gvc_mixer_control_finalize (GObject *object);
-G_DEFINE_TYPE (GvcMixerControl, gvc_mixer_control, G_TYPE_OBJECT)
+G_DEFINE_TYPE_WITH_PRIVATE (GvcMixerControl, gvc_mixer_control, G_TYPE_OBJECT)
pa_context *
gvc_mixer_control_get_pa_context (GvcMixerControl *control)
@@ -3671,14 +3669,13 @@
NULL, NULL,
g_cclosure_marshal_VOID__UINT,
G_TYPE_NONE, 1, G_TYPE_UINT);
- g_type_class_add_private (klass, sizeof (GvcMixerControlPrivate));
}
static void
gvc_mixer_control_init (GvcMixerControl *control)
{
- control->priv = GVC_MIXER_CONTROL_GET_PRIVATE (control);
+ control->priv = gvc_mixer_control_get_instance_private (control);
control->priv->pa_mainloop = pa_glib_mainloop_new
(g_main_context_default ());
g_assert (control->priv->pa_mainloop);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-desktop-4.8.1/libcvc/gvc-mixer-event-role.c
new/cinnamon-desktop-5.0.0/libcvc/gvc-mixer-event-role.c
--- old/cinnamon-desktop-4.8.1/libcvc/gvc-mixer-event-role.c 2020-12-08
11:18:50.000000000 +0100
+++ new/cinnamon-desktop-5.0.0/libcvc/gvc-mixer-event-role.c 2021-05-27
15:59:53.000000000 +0200
@@ -34,8 +34,6 @@
#include "gvc-mixer-stream-private.h"
#include "gvc-channel-map-private.h"
-#define GVC_MIXER_EVENT_ROLE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o),
GVC_TYPE_MIXER_EVENT_ROLE, GvcMixerEventRolePrivate))
-
struct GvcMixerEventRolePrivate
{
char *device;
@@ -49,7 +47,7 @@
static void gvc_mixer_event_role_finalize (GObject *object);
-G_DEFINE_TYPE (GvcMixerEventRole, gvc_mixer_event_role, GVC_TYPE_MIXER_STREAM)
+G_DEFINE_TYPE_WITH_PRIVATE (GvcMixerEventRole, gvc_mixer_event_role,
GVC_TYPE_MIXER_STREAM)
static gboolean
update_settings (GvcMixerEventRole *role,
@@ -178,14 +176,12 @@
"Device",
NULL,
G_PARAM_READWRITE|G_PARAM_CONSTRUCT));
-
- g_type_class_add_private (klass, sizeof (GvcMixerEventRolePrivate));
}
static void
gvc_mixer_event_role_init (GvcMixerEventRole *event_role)
{
- event_role->priv = GVC_MIXER_EVENT_ROLE_GET_PRIVATE (event_role);
+ event_role->priv = gvc_mixer_event_role_get_instance_private
(event_role);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-desktop-4.8.1/libcvc/gvc-mixer-sink-input.c
new/cinnamon-desktop-5.0.0/libcvc/gvc-mixer-sink-input.c
--- old/cinnamon-desktop-4.8.1/libcvc/gvc-mixer-sink-input.c 2020-12-08
11:18:50.000000000 +0100
+++ new/cinnamon-desktop-5.0.0/libcvc/gvc-mixer-sink-input.c 2021-05-27
15:59:53.000000000 +0200
@@ -33,8 +33,6 @@
#include "gvc-mixer-stream-private.h"
#include "gvc-channel-map-private.h"
-#define GVC_MIXER_SINK_INPUT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o),
GVC_TYPE_MIXER_SINK_INPUT, GvcMixerSinkInputPrivate))
-
struct GvcMixerSinkInputPrivate
{
gpointer dummy;
@@ -42,7 +40,7 @@
static void gvc_mixer_sink_input_finalize (GObject
*object);
-G_DEFINE_TYPE (GvcMixerSinkInput, gvc_mixer_sink_input, GVC_TYPE_MIXER_STREAM)
+G_DEFINE_TYPE_WITH_PRIVATE (GvcMixerSinkInput, gvc_mixer_sink_input,
GVC_TYPE_MIXER_STREAM)
static gboolean
gvc_mixer_sink_input_push_volume (GvcMixerStream *stream, gpointer *op)
@@ -114,14 +112,12 @@
stream_class->push_volume = gvc_mixer_sink_input_push_volume;
stream_class->change_is_muted = gvc_mixer_sink_input_change_is_muted;
-
- g_type_class_add_private (klass, sizeof (GvcMixerSinkInputPrivate));
}
static void
gvc_mixer_sink_input_init (GvcMixerSinkInput *sink_input)
{
- sink_input->priv = GVC_MIXER_SINK_INPUT_GET_PRIVATE (sink_input);
+ sink_input->priv = gvc_mixer_sink_input_get_instance_private
(sink_input);
}
static void
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-desktop-4.8.1/libcvc/gvc-mixer-sink.c
new/cinnamon-desktop-5.0.0/libcvc/gvc-mixer-sink.c
--- old/cinnamon-desktop-4.8.1/libcvc/gvc-mixer-sink.c 2020-12-08
11:18:50.000000000 +0100
+++ new/cinnamon-desktop-5.0.0/libcvc/gvc-mixer-sink.c 2021-05-27
15:59:53.000000000 +0200
@@ -33,8 +33,6 @@
#include "gvc-mixer-stream-private.h"
#include "gvc-channel-map-private.h"
-#define GVC_MIXER_SINK_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o),
GVC_TYPE_MIXER_SINK, GvcMixerSinkPrivate))
-
struct GvcMixerSinkPrivate
{
gpointer dummy;
@@ -42,7 +40,7 @@
static void gvc_mixer_sink_finalize (GObject *object);
-G_DEFINE_TYPE (GvcMixerSink, gvc_mixer_sink, GVC_TYPE_MIXER_STREAM)
+G_DEFINE_TYPE_WITH_PRIVATE (GvcMixerSink, gvc_mixer_sink,
GVC_TYPE_MIXER_STREAM)
static gboolean
gvc_mixer_sink_push_volume (GvcMixerStream *stream, gpointer *op)
@@ -143,14 +141,12 @@
stream_class->push_volume = gvc_mixer_sink_push_volume;
stream_class->change_port = gvc_mixer_sink_change_port;
stream_class->change_is_muted = gvc_mixer_sink_change_is_muted;
-
- g_type_class_add_private (klass, sizeof (GvcMixerSinkPrivate));
}
static void
gvc_mixer_sink_init (GvcMixerSink *sink)
{
- sink->priv = GVC_MIXER_SINK_GET_PRIVATE (sink);
+ sink->priv = gvc_mixer_sink_get_instance_private (sink);
}
static void
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-desktop-4.8.1/libcvc/gvc-mixer-source-output.c
new/cinnamon-desktop-5.0.0/libcvc/gvc-mixer-source-output.c
--- old/cinnamon-desktop-4.8.1/libcvc/gvc-mixer-source-output.c 2020-12-08
11:18:50.000000000 +0100
+++ new/cinnamon-desktop-5.0.0/libcvc/gvc-mixer-source-output.c 2021-05-27
15:59:53.000000000 +0200
@@ -33,8 +33,6 @@
#include "gvc-mixer-stream-private.h"
#include "gvc-channel-map-private.h"
-#define GVC_MIXER_SOURCE_OUTPUT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE
((o), GVC_TYPE_MIXER_SOURCE_OUTPUT, GvcMixerSourceOutputPrivate))
-
struct GvcMixerSourceOutputPrivate
{
gpointer dummy;
@@ -42,7 +40,7 @@
static void gvc_mixer_source_output_finalize (GObject
*object);
-G_DEFINE_TYPE (GvcMixerSourceOutput, gvc_mixer_source_output,
GVC_TYPE_MIXER_STREAM)
+G_DEFINE_TYPE_WITH_PRIVATE (GvcMixerSourceOutput, gvc_mixer_source_output,
GVC_TYPE_MIXER_STREAM)
static gboolean
gvc_mixer_source_output_push_volume (GvcMixerStream *stream, gpointer *op)
@@ -114,14 +112,12 @@
stream_class->push_volume = gvc_mixer_source_output_push_volume;
stream_class->change_is_muted =
gvc_mixer_source_output_change_is_muted;
-
- g_type_class_add_private (klass, sizeof (GvcMixerSourceOutputPrivate));
}
static void
gvc_mixer_source_output_init (GvcMixerSourceOutput *source_output)
{
- source_output->priv = GVC_MIXER_SOURCE_OUTPUT_GET_PRIVATE
(source_output);
+ source_output->priv = gvc_mixer_source_output_get_instance_private
(source_output);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-desktop-4.8.1/libcvc/gvc-mixer-source.c
new/cinnamon-desktop-5.0.0/libcvc/gvc-mixer-source.c
--- old/cinnamon-desktop-4.8.1/libcvc/gvc-mixer-source.c 2020-12-08
11:18:50.000000000 +0100
+++ new/cinnamon-desktop-5.0.0/libcvc/gvc-mixer-source.c 2021-05-27
15:59:53.000000000 +0200
@@ -33,8 +33,6 @@
#include "gvc-mixer-stream-private.h"
#include "gvc-channel-map-private.h"
-#define GVC_MIXER_SOURCE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o),
GVC_TYPE_MIXER_SOURCE, GvcMixerSourcePrivate))
-
struct GvcMixerSourcePrivate
{
gpointer dummy;
@@ -42,7 +40,7 @@
static void gvc_mixer_source_finalize (GObject *object);
-G_DEFINE_TYPE (GvcMixerSource, gvc_mixer_source, GVC_TYPE_MIXER_STREAM)
+G_DEFINE_TYPE_WITH_PRIVATE (GvcMixerSource, gvc_mixer_source,
GVC_TYPE_MIXER_STREAM)
static gboolean
gvc_mixer_source_push_volume (GvcMixerStream *stream, gpointer *op)
@@ -143,14 +141,12 @@
stream_class->push_volume = gvc_mixer_source_push_volume;
stream_class->change_is_muted = gvc_mixer_source_change_is_muted;
stream_class->change_port = gvc_mixer_source_change_port;
-
- g_type_class_add_private (klass, sizeof (GvcMixerSourcePrivate));
}
static void
gvc_mixer_source_init (GvcMixerSource *source)
{
- source->priv = GVC_MIXER_SOURCE_GET_PRIVATE (source);
+ source->priv = gvc_mixer_source_get_instance_private (source);
}
static void
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-desktop-4.8.1/libcvc/gvc-mixer-stream.c
new/cinnamon-desktop-5.0.0/libcvc/gvc-mixer-stream.c
--- old/cinnamon-desktop-4.8.1/libcvc/gvc-mixer-stream.c 2020-12-08
11:18:50.000000000 +0100
+++ new/cinnamon-desktop-5.0.0/libcvc/gvc-mixer-stream.c 2021-05-27
15:59:53.000000000 +0200
@@ -33,8 +33,6 @@
#include "gvc-mixer-stream-private.h"
#include "gvc-channel-map-private.h"
-#define GVC_MIXER_STREAM_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o),
GVC_TYPE_MIXER_STREAM, GvcMixerStreamPrivate))
-
static guint32 stream_serial = 1;
struct GvcMixerStreamPrivate
@@ -94,7 +92,7 @@
static void gvc_mixer_stream_finalize (GObject *object);
-G_DEFINE_ABSTRACT_TYPE (GvcMixerStream, gvc_mixer_stream, G_TYPE_OBJECT)
+G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (GvcMixerStream, gvc_mixer_stream,
G_TYPE_OBJECT)
static void
free_port (GvcMixerStreamPort *p)
@@ -1165,13 +1163,12 @@
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0, G_TYPE_NONE);
- g_type_class_add_private (klass, sizeof (GvcMixerStreamPrivate));
}
static void
gvc_mixer_stream_init (GvcMixerStream *stream)
{
- stream->priv = GVC_MIXER_STREAM_GET_PRIVATE (stream);
+ stream->priv = gvc_mixer_stream_get_instance_private (stream);
}
static void
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-desktop-4.8.1/libcvc/gvc-mixer-ui-device.c
new/cinnamon-desktop-5.0.0/libcvc/gvc-mixer-ui-device.c
--- old/cinnamon-desktop-4.8.1/libcvc/gvc-mixer-ui-device.c 2020-12-08
11:18:50.000000000 +0100
+++ new/cinnamon-desktop-5.0.0/libcvc/gvc-mixer-ui-device.c 2021-05-27
15:59:53.000000000 +0200
@@ -23,8 +23,6 @@
#include "gvc-mixer-ui-device.h"
#include "gvc-mixer-card.h"
-#define GVC_MIXER_UI_DEVICE_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE
((obj), GVC_TYPE_MIXER_UI_DEVICE, GvcMixerUIDevicePrivate))
-
struct GvcMixerUIDevicePrivate
{
gchar *first_line_desc;
@@ -64,7 +62,7 @@
static void gvc_mixer_ui_device_set_icon_name (GvcMixerUIDevice *device,
const char
*icon_name);
-G_DEFINE_TYPE (GvcMixerUIDevice, gvc_mixer_ui_device, G_TYPE_OBJECT);
+G_DEFINE_TYPE_WITH_PRIVATE (GvcMixerUIDevice, gvc_mixer_ui_device,
G_TYPE_OBJECT)
static guint32
get_next_output_serial (void)
@@ -192,7 +190,7 @@
static void
gvc_mixer_ui_device_init (GvcMixerUIDevice *device)
{
- device->priv = GVC_MIXER_UI_DEVICE_GET_PRIVATE (device);
+ device->priv = gvc_mixer_ui_device_get_instance_private (device);
}
static void
@@ -290,8 +288,6 @@
NULL,
G_PARAM_READWRITE|G_PARAM_CONSTRUCT);
g_object_class_install_property (object_class, PROP_ICON_NAME, pspec);
-
- g_type_class_add_private (klass, sizeof (GvcMixerUIDevicePrivate));
}
/* Removes the part of the string that starts with skip_prefix
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-desktop-4.8.1/meson.build
new/cinnamon-desktop-5.0.0/meson.build
--- old/cinnamon-desktop-4.8.1/meson.build 2020-12-08 11:18:50.000000000
+0100
+++ new/cinnamon-desktop-5.0.0/meson.build 2021-05-27 15:59:53.000000000
+0200
@@ -1,7 +1,7 @@
# Meson build file
# https://github.com/linuxmint/cinnamon-desktop
-project('cinnamon-desktop', 'c', version: '4.8.1',
+project('cinnamon-desktop', 'c', version: '5.0.0',
meson_version: '>=0.41.0'
)
