Mercurial > audlegacy
changeset 2515:319b10203d7c trunk
[svn] gtk_window_set_wmclass() has to be called before gtk_widget_realize(). Patched by Christian "Joker" Birchinger from Gentoo.
| author | chainsaw |
|---|---|
| date | Tue, 13 Feb 2007 13:22:51 -0800 |
| parents | 7934ac463591 |
| children | a2b862cb4269 |
| files | ChangeLog src/audacious/build_stamp.c src/audacious/ui_equalizer.c src/audacious/ui_main.c src/audacious/ui_playlist.c src/audacious/ui_skinned_window.c src/audacious/ui_skinned_window.h |
| diffstat | 7 files changed, 26 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Feb 13 06:09:50 2007 -0800 +++ b/ChangeLog Tue Feb 13 13:22:51 2007 -0800 @@ -1,3 +1,20 @@ +2007-02-13 14:09:50 +0000 Michael Farber <01mf02@gmail.com> + revision [4038] + - removed unused function bmp_menu_translate() + - removed playlist_file_selection_browser() and replaced it with + make_filebrowser() + - modified make_filebrowser() behaviour + - adapted equalizer file loading/saving functions to new + make_filebrowser() + + + trunk/src/audacious/ui_equalizer.c | 334 ++++++++++++++++++------------------- + trunk/src/audacious/ui_playlist.c | 50 ----- + trunk/src/audacious/util.c | 82 +++------ + trunk/src/audacious/util.h | 15 - + 4 files changed, 205 insertions(+), 276 deletions(-) + + 2007-02-13 13:48:33 +0000 Yoshiki Yazawa <yaz@cc.rim.or.jp> revision [4036] - delete id3 tag feature has been added.
--- a/src/audacious/build_stamp.c Tue Feb 13 06:09:50 2007 -0800 +++ b/src/audacious/build_stamp.c Tue Feb 13 13:22:51 2007 -0800 @@ -1,2 +1,2 @@ #include <glib.h> -const gchar *svn_stamp = "20070213-4036"; +const gchar *svn_stamp = "20070213-4038";
--- a/src/audacious/ui_equalizer.c Tue Feb 13 06:09:50 2007 -0800 +++ b/src/audacious/ui_equalizer.c Tue Feb 13 13:22:51 2007 -0800 @@ -737,9 +737,8 @@ GdkPixbuf *icon; gint width, height; - equalizerwin = ui_skinned_window_new(GTK_WINDOW_TOPLEVEL); + equalizerwin = ui_skinned_window_new(GTK_WINDOW_TOPLEVEL, "equalizer"); gtk_window_set_title(GTK_WINDOW(equalizerwin), _("Audacious Equalizer")); - gtk_window_set_wmclass(GTK_WINDOW(equalizerwin), "equalizer", "Audacious"); gtk_window_set_role(GTK_WINDOW(equalizerwin), "equalizer"); width = 275;
--- a/src/audacious/ui_main.c Tue Feb 13 06:09:50 2007 -0800 +++ b/src/audacious/ui_main.c Tue Feb 13 13:22:51 2007 -0800 @@ -2893,9 +2893,8 @@ { gint width, height; - mainwin = ui_skinned_window_new(GTK_WINDOW_TOPLEVEL); + mainwin = ui_skinned_window_new(GTK_WINDOW_TOPLEVEL, "player"); gtk_window_set_title(GTK_WINDOW(mainwin), _("Audacious")); - gtk_window_set_wmclass(GTK_WINDOW(mainwin), "player", "Audacious"); gtk_window_set_role(GTK_WINDOW(mainwin), "player"); gtk_window_set_resizable(GTK_WINDOW(mainwin), FALSE);
--- a/src/audacious/ui_playlist.c Tue Feb 13 06:09:50 2007 -0800 +++ b/src/audacious/ui_playlist.c Tue Feb 13 13:22:51 2007 -0800 @@ -1633,9 +1633,8 @@ { GdkPixbuf *icon; - playlistwin = ui_skinned_window_new(GTK_WINDOW_TOPLEVEL); + playlistwin = ui_skinned_window_new(GTK_WINDOW_TOPLEVEL, "playlist"); gtk_window_set_title(GTK_WINDOW(playlistwin), _("Audacious Playlist Editor")); - gtk_window_set_wmclass(GTK_WINDOW(playlistwin), "playlist", "Audacious"); gtk_window_set_role(GTK_WINDOW(playlistwin), "playlist"); gtk_window_set_default_size(GTK_WINDOW(playlistwin), playlistwin_get_width(),
--- a/src/audacious/ui_skinned_window.c Tue Feb 13 06:09:50 2007 -0800 +++ b/src/audacious/ui_skinned_window.c Tue Feb 13 13:22:51 2007 -0800 @@ -137,10 +137,13 @@ } GtkWidget * -ui_skinned_window_new(GtkWindowType type) +ui_skinned_window_new(GtkWindowType type, const gchar *wmclass_name) { GtkWidget *widget = g_object_new(ui_skinned_window_get_type(), NULL); + if (wmclass_name) + gtk_window_set_wmclass(GTK_WINDOW(widget), wmclass_name, "Audacious"); + gtk_widget_add_events(GTK_WIDGET(widget), GDK_FOCUS_CHANGE_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK |
--- a/src/audacious/ui_skinned_window.h Tue Feb 13 06:09:50 2007 -0800 +++ b/src/audacious/ui_skinned_window.h Tue Feb 13 13:22:51 2007 -0800 @@ -43,7 +43,7 @@ GtkWindowClass parent_class; }; -extern GtkWidget *ui_skinned_window_new(GtkWindowType type); +extern GtkWidget *ui_skinned_window_new(GtkWindowType type, const gchar *wmclass_name); extern void ui_skinned_window_widgetlist_associate(GtkWidget * widget, Widget * w); extern void ui_skinned_window_widgetlist_dissociate(GtkWidget * widget, Widget * w); extern gboolean ui_skinned_window_widgetlist_contained(GtkWidget * widget, gint x, gint y);