added %C (composer) expansion for pl_format_title

3 files changed, 8 insertions, 5 deletions

diff --git a/playlist.c b/playlist.c
index f5a667c1..8f2dc0ab 100644
--- a/playlist.c
+++ b/playlist.c
@@ -2474,6 +2474,9 @@ pl_format_title (playItem_t *it, int idx, char *s, int size, int id, const char
             else if (*fmt == 'B') {
                 meta = pl_find_meta (it, "band");
             }
+            else if (*fmt == 'C') {
+                meta = pl_find_meta (it, "composer");
+            }
             else if (*fmt == 'n') {
                 meta = pl_find_meta (it, "track");
             }
diff --git a/plugins/gtkui/deadbeef.glade b/plugins/gtkui/deadbeef.glade
index 9252035f..4e43799b 100644
--- a/plugins/gtkui/deadbeef.glade
+++ b/plugins/gtkui/deadbeef.glade
@@ -2245,7 +2245,7 @@ Right</property>
 	      <property name="visible">True</property>
 	      <property name="can_focus">True</property>
 	      <property name="label" translatable="yes">Format conversions (start with %):
-  [a]rtist, [t]itle, al[b]um, [B]and,
+  [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer
   track[n]umber, [N]totaltracks,
   [l]ength, [y]ear, [g]enre, [c]omment,
   copy[r]ight, [f]ilename, [T]ags
@@ -5815,7 +5815,7 @@ SOCKS5_HOSTNAME</property>
 	      <property name="visible">True</property>
 	      <property name="can_focus">True</property>
 	      <property name="label" translatable="yes">Format conversions (start with %):
-  [a]rtist, [t]itle, al[b]um, [B]and,
+  [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer
   track[n]umber, [N]totaltracks,
   [l]ength, [y]ear, [g]enre, [c]omment,
   copy[r]ight, [f]ilename, [T]ags
diff --git a/plugins/gtkui/interface.c b/plugins/gtkui/interface.c
index 9ef636de..ce410de5 100644
--- a/plugins/gtkui/interface.c
+++ b/plugins/gtkui/interface.c
@@ -21,7 +21,7 @@
 
 #define GLADE_HOOKUP_OBJECT(component,widget,name) \
   g_object_set_data_full (G_OBJECT (component), name, \
-    g_object_ref (G_OBJECT (widget)), (GDestroyNotify) g_object_unref)
+    gtk_widget_ref (widget), (GDestroyNotify) gtk_widget_unref)
 
 #define GLADE_HOOKUP_OBJECT_NO_REF(component,widget,name) \
   g_object_set_data (G_OBJECT (component), name, widget)
@@ -1456,7 +1456,7 @@ create_editcolumndlg (void)
   gtk_combo_box_append_text (GTK_COMBO_BOX (align), "Left");
   gtk_combo_box_append_text (GTK_COMBO_BOX (align), "Right");
 
-  label25 = gtk_label_new ("Format conversions (start with %):\n  [a]rtist, [t]itle, al[b]um, [B]and,\n  track[n]umber, [N]totaltracks,\n  [l]ength, [y]ear, [g]enre, [c]omment,\n  copy[r]ight, [f]ilename, [T]ags\nExample: %a - %t [%l]");
+  label25 = gtk_label_new ("Format conversions (start with %):\n  [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n  track[n]umber, [N]totaltracks,\n  [l]ength, [y]ear, [g]enre, [c]omment,\n  copy[r]ight, [f]ilename, [T]ags\nExample: %a - %t [%l]");
   gtk_widget_show (label25);
   gtk_box_pack_start (GTK_BOX (vbox14), label25, TRUE, TRUE, 0);
   GTK_WIDGET_SET_FLAGS (label25, GTK_CAN_FOCUS);
@@ -3004,7 +3004,7 @@ create_groupbydlg (void)
   gtk_entry_set_invisible_char (GTK_ENTRY (format), 9679);
   gtk_entry_set_activates_default (GTK_ENTRY (format), TRUE);
 
-  label82 = gtk_label_new ("Format conversions (start with %):\n  [a]rtist, [t]itle, al[b]um, [B]and,\n  track[n]umber, [N]totaltracks,\n  [l]ength, [y]ear, [g]enre, [c]omment,\n  copy[r]ight, [f]ilename, [T]ags\nExample: %a - %t [%l]");
+  label82 = gtk_label_new ("Format conversions (start with %):\n  [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n  track[n]umber, [N]totaltracks,\n  [l]ength, [y]ear, [g]enre, [c]omment,\n  copy[r]ight, [f]ilename, [T]ags\nExample: %a - %t [%l]");
   gtk_widget_show (label82);
   gtk_box_pack_start (GTK_BOX (vbox25), label82, FALSE, FALSE, 0);
   GTK_WIDGET_SET_FLAGS (label82, GTK_CAN_FOCUS);