diff options
Diffstat (limited to 'plugins/gtkui/gtkui.c')
| -rw-r--r-- | plugins/gtkui/gtkui.c | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/plugins/gtkui/gtkui.c b/plugins/gtkui/gtkui.c index e3081188..5bb3df1a 100644 --- a/plugins/gtkui/gtkui.c +++ b/plugins/gtkui/gtkui.c @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko <waker@users.sourceforge.net> + Copyright (C) 2009-2012 Alexey Yakovenko <waker@users.sourceforge.net> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -71,7 +71,7 @@ GtkWidget *theme_button; int gtkui_embolden_current_track; -#define TRAY_ICON "deadbeef-tray-icon" +#define TRAY_ICON "deadbeef_tray_icon" // that must be called before gtk_init void @@ -1041,6 +1041,7 @@ gtkui_thread (void *ctx) { gtk_window_set_icon_name (GTK_WINDOW (mainwin), "deadbeef"); } else { + // try loading icon from $prefix/deadbeef.png (for static build) char iconpath[1024]; snprintf (iconpath, sizeof (iconpath), "%s/deadbeef.png", deadbeef->get_prefix ()); gtk_window_set_icon_from_file (GTK_WINDOW (mainwin), iconpath, NULL); @@ -1291,6 +1292,14 @@ gtkui_connect (void) { return 0; } +static int +gtkui_disconnect (void) { + supereq_plugin = NULL; + coverart_plugin = NULL; + + return 0; +} + static gboolean quit_gtk_cb (gpointer nothing) { @@ -1353,13 +1362,15 @@ static ddb_gtkui_t plugin = { .gui.plugin.type = DB_PLUGIN_MISC, #if GTK_CHECK_VERSION(3,0,0) .gui.plugin.id = "gtkui3", + .gui.plugin.name = "GTK3 user interface", + .gui.plugin.descr = "User interface using GTK+ 3.x", #else .gui.plugin.id = "gtkui", + .gui.plugin.name = "GTK2 user interface", + .gui.plugin.descr = "User interface using GTK+ 2.x", #endif - .gui.plugin.name = "Standard GTK2 user interface", - .gui.plugin.descr = "Default DeaDBeeF GUI", .gui.plugin.copyright = - "Copyright (C) 2009-2011 Alexey Yakovenko <waker@users.sourceforge.net>\n" + "Copyright (C) 2009-2012 Alexey Yakovenko <waker@users.sourceforge.net>\n" "\n" "This program is free software; you can redistribute it and/or\n" "modify it under the terms of the GNU General Public License\n" @@ -1379,6 +1390,7 @@ static ddb_gtkui_t plugin = { .gui.plugin.start = gtkui_start, .gui.plugin.stop = gtkui_stop, .gui.plugin.connect = gtkui_connect, + .gui.plugin.disconnect = gtkui_disconnect, .gui.plugin.configdialog = settings_dlg, .gui.plugin.message = gtkui_message, .gui.run_dialog = gtkui_run_dialog_root, |