# HG changeset patch # User Gary Kramlich # Date 1652423515 18000 # Node ID b02de51a738eda7743ff45ab67dee28fa7d2b07c # Parent 53ba39406c869f1b29f813427548f44436f00998 Update PidginPresenceIcon for GTK4 Testing Done: Compiled Reviewed at https://reviews.imfreedom.org/r/1438/ diff -r 53ba39406c86 -r b02de51a738e pidgin/pidginpresenceicon.c --- a/pidgin/pidginpresenceicon.c Tue May 10 03:44:38 2022 -0500 +++ b/pidgin/pidginpresenceicon.c Fri May 13 01:31:55 2022 -0500 @@ -31,7 +31,6 @@ PurplePresence *presence; gchar *fallback; - GtkIconSize icon_size; }; enum { @@ -54,8 +53,7 @@ icon_name = pidgin_icon_name_from_presence(icon->presence, icon->fallback); - gtk_image_set_from_icon_name(GTK_IMAGE(icon->icon), icon_name, - icon->icon_size); + gtk_image_set_from_icon_name(GTK_IMAGE(icon->icon), icon_name); } static void @@ -167,7 +165,7 @@ "icon-size", "icon-size", "The GtkIconSize to use", GTK_TYPE_ICON_SIZE, - GTK_ICON_SIZE_MENU, + GTK_ICON_SIZE_NORMAL, G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS); g_object_class_install_properties(obj_class, N_PROPERTIES, properties); @@ -271,9 +269,9 @@ GtkIconSize pidgin_presence_icon_get_icon_size(PidginPresenceIcon *icon) { - g_return_val_if_fail(PIDGIN_IS_PRESENCE_ICON(icon), GTK_ICON_SIZE_INVALID); + g_return_val_if_fail(PIDGIN_IS_PRESENCE_ICON(icon), GTK_ICON_SIZE_INHERIT); - return icon->icon_size; + return gtk_image_get_icon_size(GTK_IMAGE(icon->icon)); } void @@ -282,7 +280,7 @@ { g_return_if_fail(PIDGIN_IS_PRESENCE_ICON(icon)); - icon->icon_size = icon_size; + gtk_image_set_icon_size(GTK_IMAGE(icon->icon), icon_size); g_object_freeze_notify(G_OBJECT(icon));