[SCM] gnome-mplayer/experimental: Update upstream's fix for the symbol icons
sramacher at users.alioth.debian.org
sramacher at users.alioth.debian.org
Fri Dec 14 23:09:26 UTC 2012
The following commit has been merged in the experimental branch:
commit 2dedaf9ba4d0379c41b73d1bc368923b6d3ea67c
Author: Sebastian Ramacher <sramacher at debian.org>
Date: Sat Dec 15 00:08:24 2012 +0100
Update upstream's fix for the symbol icons
diff --git a/debian/changelog b/debian/changelog
index 8e76e3e..c995a10 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
gnome-mplayer (1.0.7-3) UNRELEASED; urgency=low
* Team upload.
+ * debian/patches:
+ - fallback-to-nonsymbolic.patch: Update upstream's fix.
-- Sebastian Ramacher <sramacher at debian.org> Fri, 14 Dec 2012 23:55:04 +0100
diff --git a/debian/patches/fallback-to-nonsymbolic-icons.patch b/debian/patches/fallback-to-nonsymbolic-icons.patch
index f83af01..0f6ca0b 100644
--- a/debian/patches/fallback-to-nonsymbolic-icons.patch
+++ b/debian/patches/fallback-to-nonsymbolic-icons.patch
@@ -1,12 +1,192 @@
Description: Fall back to non-symbolic icons if necessary
If the icon theme doesn't support symoblic icons, fallback to the hicolor
icons.
-Origin: https://code.google.com/p/gnome-mplayer/source/detail?r=2357
-Last-Update: 2012-11-22
+Origin: upstream,
+ https://code.google.com/p/gnome-mplayer/source/detail?r=2357
+ https://code.google.com/p/gnome-mplayer/source/detail?r=2363
+Last-Update: 2012-12-15
---- a/src/gui.c (revision 2356)
-+++ b/src/gui.c (revision 2357)
-@@ -7726,15 +7726,33 @@
+--- a/src/gui.c
++++ b/src/gui.c
+@@ -1182,13 +1182,18 @@
+ gboolean set_gui_state(void *data)
+ {
+ gchar *tip_text = NULL;
+-
++ GtkIconTheme *icon_theme = gtk_icon_theme_get_default();
++
+ gm_log(verbose, G_LOG_LEVEL_MESSAGE, "setting gui state to %s", PLAYSTATE_to_string(guistate));
+
+ if (lastguistate != guistate) {
+ if (guistate == PLAYING) {
+ #ifdef GTK3_ENABLED
+- gtk_image_set_from_icon_name(GTK_IMAGE(image_play), "media-playback-pause-symbolic", button_size);
++ if (gtk_icon_theme_has_icon(icon_theme, "media-playback-pause-symbolic")) {
++ gtk_image_set_from_icon_name(GTK_IMAGE(image_play), "media-playback-pause-symbolic", button_size);
++ } else {
++ gtk_image_set_from_stock(GTK_IMAGE(image_play), GTK_STOCK_MEDIA_PAUSE, button_size);
++ }
+ #else
+ gtk_image_set_from_stock(GTK_IMAGE(image_play), GTK_STOCK_MEDIA_PAUSE, button_size);
+ #endif
+@@ -1214,7 +1219,11 @@
+
+ if (guistate == PAUSED) {
+ #ifdef GTK3_ENABLED
+- gtk_image_set_from_icon_name(GTK_IMAGE(image_play), "media-playback-start-symbolic", button_size);
++ if (gtk_icon_theme_has_icon(icon_theme, "media-playback-start-symbolic")) {
++ gtk_image_set_from_icon_name(GTK_IMAGE(image_play), "media-playback-start-symbolic", button_size);
++ } else {
++ gtk_image_set_from_stock(GTK_IMAGE(image_play), GTK_STOCK_MEDIA_PLAY, button_size);
++ }
+ #else
+ gtk_image_set_from_stock(GTK_IMAGE(image_play), GTK_STOCK_MEDIA_PLAY, button_size);
+ #endif
+@@ -1239,7 +1248,11 @@
+
+ if (guistate == STOPPED) {
+ #ifdef GTK3_ENABLED
+- gtk_image_set_from_icon_name(GTK_IMAGE(image_play), "media-playback-start-symbolic", button_size);
++ if (gtk_icon_theme_has_icon(icon_theme, "media-playback-start-symbolic")) {
++ gtk_image_set_from_icon_name(GTK_IMAGE(image_play), "media-playback-start-symbolic", button_size);
++ } else {
++ gtk_image_set_from_stock(GTK_IMAGE(image_play), GTK_STOCK_MEDIA_PLAY, button_size);
++ }
+ #else
+ gtk_image_set_from_stock(GTK_IMAGE(image_play), GTK_STOCK_MEDIA_PLAY, button_size);
+ #endif
+@@ -2577,7 +2590,8 @@
+ gboolean stop_callback(GtkWidget * widget, GdkEventExpose * event, void *data)
+ {
+ IdleData *idle = (IdleData *) data;
+-
++ GtkIconTheme *icon_theme = gtk_icon_theme_get_default();
++
+ if (gmtk_media_player_get_media_state(GMTK_MEDIA_PLAYER(media)) == MEDIA_STATE_PLAY ||
+ gmtk_media_player_get_media_state(GMTK_MEDIA_PLAYER(media)) == MEDIA_STATE_PAUSE) {
+ gmtk_media_player_set_state(GMTK_MEDIA_PLAYER(media), MEDIA_STATE_STOP);
+@@ -2585,7 +2599,11 @@
+ gmtk_media_tracker_set_percentage(tracker, 0.0);
+ gtk_widget_set_sensitive(play_event_box, TRUE);
+ #ifdef GTK3_ENABLED
+- gtk_image_set_from_icon_name(GTK_IMAGE(image_play), "media-playback-start-symbolic", button_size);
++ if (gtk_icon_theme_has_icon(icon_theme, "media-playback-start-symbolic")) {
++ gtk_image_set_from_icon_name(GTK_IMAGE(image_play), "media-playback-start-symbolic", button_size);
++ } else {
++ gtk_image_set_from_stock(GTK_IMAGE(image_play), GTK_STOCK_MEDIA_PLAY, button_size);
++ }
+ #else
+ gtk_image_set_from_stock(GTK_IMAGE(image_play), GTK_STOCK_MEDIA_PLAY, button_size);
+ #endif
+@@ -2599,7 +2617,11 @@
+ if (gmtk_media_player_get_media_state(GMTK_MEDIA_PLAYER(media)) == MEDIA_STATE_QUIT) {
+ gmtk_media_tracker_set_percentage(tracker, 0.0);
+ #ifdef GTK3_ENABLED
+- gtk_image_set_from_icon_name(GTK_IMAGE(image_play), "media-playback-start-symbolic", button_size);
++ if (gtk_icon_theme_has_icon(icon_theme, "media-playback-start-symbolic")) {
++ gtk_image_set_from_icon_name(GTK_IMAGE(image_play), "media-playback-start-symbolic", button_size);
++ } else {
++ gtk_image_set_from_stock(GTK_IMAGE(image_play), GTK_STOCK_MEDIA_PLAY, button_size);
++ }
+ #else
+ gtk_image_set_from_stock(GTK_IMAGE(image_play), GTK_STOCK_MEDIA_PLAY, button_size);
+ #endif
+@@ -2672,7 +2694,8 @@
+ GtkTreePath *path;
+ GtkTreeIter previter;
+ GtkTreeIter localiter;
+-
++ GtkIconTheme *icon_theme = gtk_icon_theme_get_default();
++
+ if (gtk_list_store_iter_is_valid(playliststore, &iter)) {
+ if (gmtk_media_player_get_attribute_boolean(GMTK_MEDIA_PLAYER(media), ATTRIBUTE_HAS_CHAPTERS)) {
+ valid = FALSE;
+@@ -2706,7 +2729,11 @@
+ autopause = FALSE;
+ gtk_widget_set_sensitive(play_event_box, TRUE);
+ #ifdef GTK3_ENABLED
+- gtk_image_set_from_icon_name(GTK_IMAGE(image_play), "media-playback-start-symbolic", button_size);
++ if (gtk_icon_theme_has_icon(icon_theme, "media-playback-start-symbolic")) {
++ gtk_image_set_from_icon_name(GTK_IMAGE(image_play), "media-playback-start-symbolic", button_size);
++ } else {
++ gtk_image_set_from_stock(GTK_IMAGE(image_play), GTK_STOCK_MEDIA_PLAY, button_size);
++ }
+ #else
+ gtk_image_set_from_stock(GTK_IMAGE(image_play), GTK_STOCK_MEDIA_PLAY, button_size);
+ #endif
+@@ -2733,7 +2760,8 @@
+ {
+ gboolean valid = FALSE;
+ GtkTreePath *path;
+-
++ GtkIconTheme *icon_theme = gtk_icon_theme_get_default();
++
+ if (gtk_list_store_iter_is_valid(playliststore, &iter)) {
+ if (gmtk_media_player_get_attribute_boolean(GMTK_MEDIA_PLAYER(media), ATTRIBUTE_HAS_CHAPTERS)) {
+ gmtk_media_player_seek_chapter(GMTK_MEDIA_PLAYER(media), 1, SEEK_RELATIVE);
+@@ -2756,7 +2784,11 @@
+ autopause = FALSE;
+ gtk_widget_set_sensitive(play_event_box, TRUE);
+ #ifdef GTK3_ENABLED
+- gtk_image_set_from_icon_name(GTK_IMAGE(image_play), "media-playback-start-symbolic", button_size);
++ if (gtk_icon_theme_has_icon(icon_theme, "media-playback-start-symbolic")) {
++ gtk_image_set_from_icon_name(GTK_IMAGE(image_play), "media-playback-start-symbolic", button_size);
++ } else {
++ gtk_image_set_from_stock(GTK_IMAGE(image_play), GTK_STOCK_MEDIA_PLAY, button_size);
++ }
+ #else
+ gtk_image_set_from_stock(GTK_IMAGE(image_play), GTK_STOCK_MEDIA_PLAY, button_size);
+ #endif
+@@ -6718,7 +6750,8 @@
+ gchar *tip_text = NULL;
+ #endif
+ gchar *short_filename = NULL;
+-
++ GtkIconTheme *icon_theme = gtk_icon_theme_get_default();
++
+ gm_log(verbose, G_LOG_LEVEL_MESSAGE, "in media state change with state = %s dontplaynext = %i",
+ gmtk_media_state_to_string(media_state), dontplaynext);
+ switch (media_state) {
+@@ -6774,7 +6807,11 @@
+ // break purposely not put here, so gui is properly updated
+ case MEDIA_STATE_STOP:
+ #ifdef GTK3_ENABLED
+- gtk_image_set_from_icon_name(GTK_IMAGE(image_play), "media-playback-start-symbolic", button_size);
++ if (gtk_icon_theme_has_icon(icon_theme, "media-playback-start-symbolic")) {
++ gtk_image_set_from_icon_name(GTK_IMAGE(image_play), "media-playback-start-symbolic", button_size);
++ } else {
++ gtk_image_set_from_stock(GTK_IMAGE(image_play), GTK_STOCK_MEDIA_PLAY, button_size);
++ }
+ #else
+ gtk_image_set_from_stock(GTK_IMAGE(image_play), GTK_STOCK_MEDIA_PLAY, button_size);
+ #endif
+@@ -6810,7 +6847,11 @@
+ if (idledata->mapped_af_export == NULL)
+ map_af_export_file(idledata);
+ #ifdef GTK3_ENABLED
+- gtk_image_set_from_icon_name(GTK_IMAGE(image_play), "media-playback-pause-symbolic", button_size);
++ if (gtk_icon_theme_has_icon(icon_theme, "media-playback-pause-symbolic")) {
++ gtk_image_set_from_icon_name(GTK_IMAGE(image_play), "media-playback-pause-symbolic", button_size);
++ } else {
++ gtk_image_set_from_stock(GTK_IMAGE(image_play), GTK_STOCK_MEDIA_PAUSE, button_size);
++ }
+ #else
+ gtk_image_set_from_stock(GTK_IMAGE(image_play), GTK_STOCK_MEDIA_PAUSE, button_size);
+ #endif
+@@ -6855,7 +6896,11 @@
+ break;
+ case MEDIA_STATE_PAUSE:
+ #ifdef GTK3_ENABLED
+- gtk_image_set_from_icon_name(GTK_IMAGE(image_play), "media-playback-start-symbolic", button_size);
++ if (gtk_icon_theme_has_icon(icon_theme, "media-playback-start-symbolic")) {
++ gtk_image_set_from_icon_name(GTK_IMAGE(image_play), "media-playback-start-symbolic", button_size);
++ } else {
++ gtk_image_set_from_stock(GTK_IMAGE(image_play), GTK_STOCK_MEDIA_PLAY, button_size);
++ }
+ #else
+ gtk_image_set_from_stock(GTK_IMAGE(image_play), GTK_STOCK_MEDIA_PLAY, button_size);
+ #endif
+@@ -7726,15 +7771,33 @@
gtk_container_add(GTK_CONTAINER(window), vbox_master);
icon_theme = gtk_icon_theme_get_default();
#ifdef GTK3_ENABLED
@@ -49,4 +229,44 @@ Last-Update: 2012-11-22
#else
image_play = gtk_image_new_from_stock(GTK_STOCK_MEDIA_PLAY, button_size);
image_stop = gtk_image_new_from_stock(GTK_STOCK_MEDIA_STOP, button_size);
-
+@@ -8390,6 +8453,8 @@
+ GdkScreen *screen;
+ GdkRectangle rect;
+ GtkAllocation alloc;
++ GtkIconTheme *icon_theme = gtk_icon_theme_get_default();
++
+ if (fs_controls == NULL && fullscreen) {
+ fs_controls = gtk_window_new(GTK_WINDOW_POPUP);
+ gtk_widget_add_events(fs_controls, GDK_ENTER_NOTIFY_MASK);
+@@ -8398,7 +8463,11 @@
+ g_signal_connect(G_OBJECT(fs_controls), "leave_notify_event", G_CALLBACK(fs_controls_left), NULL);
+ g_object_ref(hbox);
+ #ifdef GTK3_ENABLED
+- gtk_image_set_from_icon_name(GTK_IMAGE(image_fs), "view-restore-symbolic", button_size);
++ if (gtk_icon_theme_has_icon(icon_theme, "view-restore-symbolic")) {
++ gtk_image_set_from_icon_name(GTK_IMAGE(image_play), "view-restore-symbolic", button_size);
++ } else {
++ gtk_image_set_from_stock(GTK_IMAGE(image_play), GTK_STOCK_LEAVE_FULLSCREEN, button_size);
++ }
+ #else
+ gtk_image_set_from_stock(GTK_IMAGE(image_fs), GTK_STOCK_LEAVE_FULLSCREEN, button_size);
+ #endif
+@@ -8428,11 +8497,16 @@
+
+ void hide_fs_controls()
+ {
+-
++ GtkIconTheme *icon_theme = gtk_icon_theme_get_default();
++
+ if (fs_controls != NULL) {
+ g_object_ref(hbox);
+ #ifdef GTK3_ENABLED
+- gtk_image_set_from_icon_name(GTK_IMAGE(image_fs), "view-fullscreen-symbolic", button_size);
++ if (gtk_icon_theme_has_icon(icon_theme, "view-fullscreen-symbolic")) {
++ gtk_image_set_from_icon_name(GTK_IMAGE(image_play), "view-fullscreen-symbolic", button_size);
++ } else {
++ gtk_image_set_from_stock(GTK_IMAGE(image_play), GTK_STOCK_FULLSCREEN, button_size);
++ }
+ #else
+ gtk_image_set_from_stock(GTK_IMAGE(image_fs), GTK_STOCK_FULLSCREEN, button_size);
+ #endif
--
gnome-mplayer packaging
More information about the pkg-multimedia-commits
mailing list