Skip to content

Commit 3110684

Browse files
amidiplug: Stop using deprecated GdkPixbuf function
See also: https://docs.gtk.org/gdk-pixbuf/ctor.Pixbuf.new_from_xpm_data.html
1 parent 15f34ce commit 3110684

File tree

2 files changed

+4
-321
lines changed

2 files changed

+4
-321
lines changed

src/amidiplug/amidi-plug.midiicon.xpm

Lines changed: 0 additions & 312 deletions
This file was deleted.

src/amidiplug/i_fileinfo.cc

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@
3333

3434
/* this is needed to retrieve information */
3535
#include "i_midi.h"
36-
/* icon from gnome-mime-audio-midi.png of the GNOME ICON SET */
37-
#include "amidi-plug.midiicon.xpm"
3836

3937

4038
void i_fileinfo_ev_close (GtkWidget * button, void * fileinfowin)
@@ -130,7 +128,6 @@ bool i_fileinfo_gui (const char * filename_uri, VFSFile & file)
130128
GtkWidget * lyrics_frame, *lyrics_tv, *lyrics_tv_sw;
131129
GtkTextBuffer * text_tb, *lyrics_tb;
132130
GtkWidget * footer_hbbox, *footer_bclose;
133-
GdkPixbuf * title_icon_pixbuf;
134131
PangoAttrList * pangoattrlist;
135132
PangoAttribute * pangoattr;
136133
GString * value_gstring;
@@ -173,9 +170,7 @@ bool i_fileinfo_gui (const char * filename_uri, VFSFile & file)
173170
title_hbox = audgui_hbox_new (5);
174171
gtk_box_pack_start (GTK_BOX (fileinfowin_vbox), title_hbox, false, false, 0);
175172

176-
title_icon_pixbuf = gdk_pixbuf_new_from_xpm_data ((const char **) amidiplug_xpm_midiicon);
177-
title_icon_image = gtk_image_new_from_pixbuf (title_icon_pixbuf);
178-
g_object_unref (title_icon_pixbuf);
173+
title_icon_image = gtk_image_new_from_icon_name ("audio-x-generic", GTK_ICON_SIZE_DIALOG);
179174
#ifndef USE_GTK3
180175
gtk_misc_set_alignment (GTK_MISC (title_icon_image), 0, 0);
181176
#endif
@@ -185,7 +180,7 @@ bool i_fileinfo_gui (const char * filename_uri, VFSFile & file)
185180
gtk_label_set_attributes (GTK_LABEL (title_name_f_label), pangoattrlist);
186181
gtk_box_pack_start (GTK_BOX (title_hbox), title_name_f_label, false, false, 0);
187182

188-
title_name_v_entry = gtk_entry_new();
183+
title_name_v_entry = gtk_entry_new ();
189184
gtk_editable_set_editable (GTK_EDITABLE (title_name_v_entry), false);
190185
gtk_widget_set_size_request (GTK_WIDGET (title_name_v_entry), 200, -1);
191186
gtk_box_pack_start (GTK_BOX (title_hbox), title_name_v_entry, true, true, 0);
@@ -198,7 +193,7 @@ bool i_fileinfo_gui (const char * filename_uri, VFSFile & file)
198193
midiinfoboxes_vbox = audgui_vbox_new (2);
199194
gtk_box_pack_start (GTK_BOX (fileinfowin_columns_hbox), midiinfoboxes_vbox, false, false, 0);
200195

201-
info_frame_tl = gtk_label_new ("");
196+
info_frame_tl = gtk_label_new (nullptr);
202197
gtk_label_set_markup (GTK_LABEL (info_frame_tl), _("<span size=\"smaller\"> MIDI Info </span>"));
203198
gtk_box_pack_start (GTK_BOX (midiinfoboxes_vbox), info_frame_tl, false, false, 0);
204199

@@ -247,7 +242,7 @@ bool i_fileinfo_gui (const char * filename_uri, VFSFile & file)
247242
miditextboxes_vbox = audgui_vbox_new (2);
248243
gtk_box_pack_start (GTK_BOX (fileinfowin_columns_hbox), miditextboxes_vbox, true, true, 0);
249244

250-
text_frame_tl = gtk_label_new ("");
245+
text_frame_tl = gtk_label_new (nullptr);
251246
gtk_label_set_markup (GTK_LABEL (text_frame_tl),
252247
_("<span size=\"smaller\"> MIDI Comments and Lyrics </span>"));
253248
gtk_box_pack_start (GTK_BOX (miditextboxes_vbox), text_frame_tl, false, false, 0);

0 commit comments

Comments
 (0)