From be68b43ccc63023250918b2cf2dbe0ee55d6fcef Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Sat, 5 Aug 2023 01:27:39 +0200 Subject: src/idoplaybackmenuitem.c: Fix undefined variable --- src/idoplaybackmenuitem.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/idoplaybackmenuitem.c b/src/idoplaybackmenuitem.c index 7f19718..efc2381 100644 --- a/src/idoplaybackmenuitem.c +++ b/src/idoplaybackmenuitem.c @@ -1,5 +1,6 @@ /* * Copyright 2013 Canonical Ltd. + * Copyright 2023 Robert Tari * * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License version 3, as published @@ -18,6 +19,7 @@ * Mirco Müller * Andrea Cimitan * Lars Uebernickel + * Robert Tari */ #include "idoplaybackmenuitem.h" @@ -291,13 +293,12 @@ ido_playback_menu_item_button_release_event (GtkWidget *menuitem, { IdoPlaybackMenuItem *item = IDO_PLAYBACK_MENU_ITEM (menuitem); Button button; - const gchar *action = action; button = ido_playback_menu_item_get_button_at_pos (menuitem, event->x, event->y); if (button != item->cur_pushed_button) button = BUTTON_NONE; - action = item->button_actions[item->cur_pushed_button]; + const gchar *action = item->button_actions[item->cur_pushed_button]; if (item->action_group && action) g_action_group_activate_action (item->action_group, action, NULL); -- cgit v1.2.3 From c2bade07c6a825cd86627dc3eee4d8f9a1b39ac7 Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Sat, 5 Aug 2023 01:31:12 +0200 Subject: src/idoplaybackmenuitem.c: Drop unused variable --- src/idoplaybackmenuitem.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/idoplaybackmenuitem.c b/src/idoplaybackmenuitem.c index efc2381..fc42b6d 100644 --- a/src/idoplaybackmenuitem.c +++ b/src/idoplaybackmenuitem.c @@ -292,11 +292,6 @@ ido_playback_menu_item_button_release_event (GtkWidget *menuitem, GdkEventButton *event) { IdoPlaybackMenuItem *item = IDO_PLAYBACK_MENU_ITEM (menuitem); - Button button; - - button = ido_playback_menu_item_get_button_at_pos (menuitem, event->x, event->y); - if (button != item->cur_pushed_button) - button = BUTTON_NONE; const gchar *action = item->button_actions[item->cur_pushed_button]; if (item->action_group && action) -- cgit v1.2.3 From 579cad6e979ba6b271a121749a78331b406f127a Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Sat, 5 Aug 2023 01:34:51 +0200 Subject: src/idoalarmmenuitem.c: Do not free non memory-allocated variable --- src/idoalarmmenuitem.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/idoalarmmenuitem.c b/src/idoalarmmenuitem.c index 7b70e6d..1547809 100644 --- a/src/idoalarmmenuitem.c +++ b/src/idoalarmmenuitem.c @@ -1,9 +1,11 @@ /* * Copyright 2013 Canonical Ltd. + * Copyright 2021-2023 Robert Tari * * Authors: * Charles Kerr * Ted Gould + * Robert Tari * * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License version 3, as published @@ -91,8 +93,6 @@ ido_alarm_menu_item_new_from_model (GMenuItem * menu_item, for (i=0; i Date: Sat, 5 Aug 2023 02:01:59 +0200 Subject: Fix possible memory leaks --- src/idoappointmentmenuitem.c | 3 ++- src/idolocationmenuitem.c | 3 +++ src/idousermenuitem.c | 4 ++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/idoappointmentmenuitem.c b/src/idoappointmentmenuitem.c index 0219c2c..dcdc3a8 100644 --- a/src/idoappointmentmenuitem.c +++ b/src/idoappointmentmenuitem.c @@ -1,6 +1,6 @@ /* * Copyright 2013 Canonical Ltd. - * Copyright 2021 Robert Tari + * Copyright 2021-2023 Robert Tari * * Authors: * Charles Kerr @@ -136,6 +136,7 @@ ido_appointment_menu_item_new_from_model (GMenuItem * menu_item, for (i=0; i + * Robert Tari * * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License version 3, as published @@ -337,6 +339,7 @@ ido_location_menu_item_new_from_model (GMenuItem * menu_item, for (i=0; i Mirco Müller Charles Kerr + Robert Tari This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License version 3, as published @@ -445,6 +447,8 @@ user_menu_item_new_from_model (GMenuItem * menuitem, for (i=0; i Date: Sat, 5 Aug 2023 02:03:39 +0200 Subject: Do not hardcode icon sizes fixes https://github.com/AyatanaIndicators/ayatana-indicator-sound/issues/89 --- src/idobasicmenuitem.c | 23 +++-------------------- src/idolevelmenuitem.c | 19 ++----------------- src/idomediaplayermenuitem.c | 2 ++ src/idoremovablemenuitem.c | 21 ++++----------------- 4 files changed, 11 insertions(+), 54 deletions(-) diff --git a/src/idobasicmenuitem.c b/src/idobasicmenuitem.c index 5077546..5106144 100644 --- a/src/idobasicmenuitem.c +++ b/src/idobasicmenuitem.c @@ -1,6 +1,6 @@ /* * Copyright 2013 Canonical Ltd. - * Copyright 2021-2022 Robert Tari + * Copyright 2021-2023 Robert Tari * * Authors: * Charles Kerr @@ -163,25 +163,8 @@ ido_basic_menu_item_update_image (IdoBasicMenuItem *self) } else if (p->icon) { - GtkIconInfo *info; - const gchar *filename; - - info = gtk_icon_theme_lookup_by_gicon (gtk_icon_theme_get_default (), p->icon, 16, 0); - filename = gtk_icon_info_get_filename (info); - - if (filename) - { - GdkPixbuf *pixbuf; - - pixbuf = gdk_pixbuf_new_from_file_at_scale (filename, -1, 16, TRUE, NULL); - gtk_image_set_from_pixbuf (GTK_IMAGE (p->image), pixbuf); - - g_object_unref (pixbuf); - } - - gtk_widget_set_visible (p->image, filename != NULL); - - g_object_unref (info); + gtk_image_set_from_gicon (GTK_IMAGE (p->image), p->icon, GTK_ICON_SIZE_MENU); + gtk_widget_set_visible (p->image, TRUE); } } } diff --git a/src/idolevelmenuitem.c b/src/idolevelmenuitem.c index b7ce543..5f4f5bb 100644 --- a/src/idolevelmenuitem.c +++ b/src/idolevelmenuitem.c @@ -143,23 +143,8 @@ static void idoLevelMenuItemStyleUpdateImage (IdoLevelMenuItem *self) } else { - GtkIconInfo *pInfo; - const gchar *sFilename; - - pInfo = gtk_icon_theme_lookup_by_gicon (gtk_icon_theme_get_default(), pPrivate->pIcon, 16, 0); - sFilename = gtk_icon_info_get_filename (pInfo); - - if (sFilename) - { - GdkPixbuf *pPixbuf; - - pPixbuf = gdk_pixbuf_new_from_file_at_scale (sFilename, -1, 16, TRUE, NULL); - gtk_image_set_from_pixbuf (GTK_IMAGE (pPrivate->pImage), pPixbuf); - g_object_unref (pPixbuf); - } - - gtk_widget_set_visible (pPrivate->pImage, sFilename != NULL); - g_object_unref (pInfo); + gtk_image_set_from_gicon (GTK_IMAGE (pPrivate->pImage), pPrivate->pIcon, GTK_ICON_SIZE_MENU); + gtk_widget_set_visible (pPrivate->pImage, TRUE); } } diff --git a/src/idomediaplayermenuitem.c b/src/idomediaplayermenuitem.c index 801d57b..071c4af 100644 --- a/src/idomediaplayermenuitem.c +++ b/src/idomediaplayermenuitem.c @@ -1,5 +1,6 @@ /* * Copyright 2013 Canonical Ltd. + * Copyright 2023 Robert Tari * * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License version 3, as published @@ -17,6 +18,7 @@ * Conor Curran * Mirco Müller * Lars Uebernickel + * Robert Tari */ #include "idomediaplayermenuitem.h" diff --git a/src/idoremovablemenuitem.c b/src/idoremovablemenuitem.c index 946ffb3..d857fd4 100644 --- a/src/idoremovablemenuitem.c +++ b/src/idoremovablemenuitem.c @@ -1,8 +1,10 @@ /* * Copyright 2013 Canonical Ltd. + * Copyright 2023 Robert Tari * * Authors: * Charles Kerr + * Robert Tari * * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License version 3, as published @@ -131,23 +133,8 @@ static void idoRemovableMenuItemStyleUpdateImage(IdoRemovableMenuItem *self) } else { - GtkIconInfo *pInfo; - const gchar *sFilename; - - pInfo = gtk_icon_theme_lookup_by_gicon(gtk_icon_theme_get_default(), pPrivate->pIcon, 16, 0); - sFilename = gtk_icon_info_get_filename(pInfo); - - if (sFilename) - { - GdkPixbuf *pPixbuf; - - pPixbuf = gdk_pixbuf_new_from_file_at_scale(sFilename, -1, 16, TRUE, NULL); - gtk_image_set_from_pixbuf(GTK_IMAGE(pPrivate->pImage), pPixbuf); - g_object_unref (pPixbuf); - } - - gtk_widget_set_visible(pPrivate->pImage, sFilename != NULL); - g_object_unref(pInfo); + gtk_image_set_from_gicon (GTK_IMAGE (pPrivate->pImage), pPrivate->pIcon, GTK_ICON_SIZE_MENU); + gtk_widget_set_visible (pPrivate->pImage, TRUE); } } -- cgit v1.2.3