[gnome-music] Fix the icons in RTL with last GTK+

[Yosef Or Boczko <yoseforb src gnome org>]

commit 7cb4ec4a6cff5c35f7dab899ffd1c75dd5977435
Author: Yosef Or Boczko <yoseforb src gnome org>
Date:   Tue Sep 2 17:09:01 2014 +0300

    Fix the icons in RTL with last GTK+
    
    https://bugzilla.gnome.org/show_bug.cgi?id=735890

 gnomemusic/notification.py |   11 +++--------
 gnomemusic/player.py       |   27 ++++-----------------------
 gnomemusic/toolbar.py      |    3 ---
 gnomemusic/view.py         |    5 +----
 gnomemusic/widgets.py      |    5 +----
 5 files changed, 9 insertions(+), 42 deletions(-)
---
diff --git a/gnomemusic/notification.py b/gnomemusic/notification.py
index bf7e3a4..cf8e1fe 100644
--- a/gnomemusic/notification.py
+++ b/gnomemusic/notification.py
@@ -122,20 +122,15 @@ class NotificationManager:
         self._notification.clear_actions()
 
         if (Notify.VERSION_MINOR > 7) or (Notify.VERSION_MINOR == 7 and Notify.VERSION_MICRO > 5):
-            if Gtk.Widget.get_default_direction() is Gtk.TextDirection.RTL:
-                postfix = '-rtl'
-            else:
-                postfix = ''
-
-            self._notification.add_action('media-skip-backward%s' % postfix, _("Previous"),
+            self._notification.add_action('media-skip-backward', _("Previous"),
                                           self._go_previous, None)
             if playing:
                 self._notification.add_action('media-playback-pause', _("Pause"),
                                               self._pause, None)
             else:
-                self._notification.add_action('media-playback-start%s' % postfix, _("Play"),
+                self._notification.add_action('media-playback-start', _("Play"),
                                               self._play, None)
-            self._notification.add_action('media-skip-forward%s' % postfix, _("Next"),
+            self._notification.add_action('media-skip-forward', _("Next"),
                                           self._go_next, None)
 
     @log
diff --git a/gnomemusic/player.py b/gnomemusic/player.py
index b703ab8..3c6e03e 100644
--- a/gnomemusic/player.py
+++ b/gnomemusic/player.py
@@ -568,13 +568,6 @@ class Player(GObject.GObject):
         self.progressScale.connect('value-changed', self._on_progress_value_changed)
         self.progressScale.connect('button-release-event', self._on_progress_scale_button_released)
 
-        if Gtk.Widget.get_default_direction() is Gtk.TextDirection.RTL:
-            self._prevImage = self._ui.get_object('previous_image')
-            self._nextImage = self._ui.get_object('next_image')
-            self._prevImage.set_property('icon-name', 'media-skip-backward-rtl-symbolic')
-            self._nextImage.set_property('icon-name', 'media-skip-forward-rtl-symbolic')
-            self._playImage.set_property('icon-name', 'media-playback-start-rtl-symbolic')
-
     @log
     def _on_progress_scale_button_released(self, scale, data):
         self.on_progress_scale_change_value(self.progressScale)
@@ -636,25 +629,13 @@ class Player(GObject.GObject):
     def _sync_repeat_image(self):
         icon = None
         if self.repeat == RepeatType.NONE:
-            if Gtk.Widget.get_default_direction() is not Gtk.TextDirection.RTL:
-                icon = 'media-playlist-consecutive-symbolic'
-            else:
-                icon = 'media-playlist-consecutive-rtl-symbolic'
+            icon = 'media-playlist-consecutive-symbolic'
         elif self.repeat == RepeatType.SHUFFLE:
-            if Gtk.Widget.get_default_direction() is not Gtk.TextDirection.RTL:
-                icon = 'media-playlist-shuffle-symbolic'
-            else:
-                icon = 'media-playlist-shuffle-rtl-symbolic'
+            icon = 'media-playlist-shuffle-symbolic'
         elif self.repeat == RepeatType.ALL:
-            if Gtk.Widget.get_default_direction() is not Gtk.TextDirection.RTL:
-                icon = 'media-playlist-repeat-symbolic'
-            else:
-                icon = 'media-playlist-repeat-rtl-symbolic'
+            icon = 'media-playlist-repeat-symbolic'
         elif self.repeat == RepeatType.SONG:
-            if Gtk.Widget.get_default_direction() is not Gtk.TextDirection.RTL:
-                icon = 'media-playlist-repeat-song-symbolic'
-            else:
-                icon = 'media-playlist-repeat-song-rtl-symbolic'
+            icon = 'media-playlist-repeat-song-symbolic'
 
         self.repeatBtnImage.set_from_icon_name(icon, Gtk.IconSize.MENU)
         self.emit('repeat-mode-changed')
diff --git a/gnomemusic/toolbar.py b/gnomemusic/toolbar.py
index a4e1efc..6976828 100644
--- a/gnomemusic/toolbar.py
+++ b/gnomemusic/toolbar.py
@@ -71,9 +71,6 @@ class Toolbar(GObject.GObject):
         self._selection_menu_button = self._ui.get_object('selection-menu-button')
         self._selection_menu_label = self._ui.get_object('selection-menu-button-label')
         self._selection_menu_button.set_relief(Gtk.ReliefStyle.NONE)
-        if Gtk.Widget.get_default_direction() is Gtk.TextDirection.RTL:
-            _back_button_image = self._ui.get_object('back-button-image')
-            _back_button_image.set_property('icon-name', 'go-previous-rtl-symbolic')
         if Gtk.get_minor_version() >= 11:
             self.header_bar.remove(self._select_button)
             self.header_bar.remove(self._cancel_button)
diff --git a/gnomemusic/view.py b/gnomemusic/view.py
index c6dc900..7ee34e6 100644
--- a/gnomemusic/view.py
+++ b/gnomemusic/view.py
@@ -63,10 +63,7 @@ playlists = Playlists.get_default()
 
 
 class ViewContainer(Gtk.Stack):
-    if Gtk.Widget.get_default_direction() is not Gtk.TextDirection.RTL:
-        nowPlayingIconName = 'media-playback-start-symbolic'
-    else:
-        nowPlayingIconName = 'media-playback-start-rtl-symbolic'
+    nowPlayingIconName = 'media-playback-start-symbolic'
     errorIconName = 'dialog-error-symbolic'
     starIconName = 'starred-symbolic'
 
diff --git a/gnomemusic/widgets.py b/gnomemusic/widgets.py
index f894d5b..bf11a38 100644
--- a/gnomemusic/widgets.py
+++ b/gnomemusic/widgets.py
@@ -52,10 +52,7 @@ except Exception as e:
     exit(1)
 
 ALBUM_ART_CACHE = AlbumArtCache.get_default()
-if Gtk.Widget.get_default_direction() is not Gtk.TextDirection.RTL:
-    NOW_PLAYING_ICON_NAME = 'media-playback-start-symbolic'
-else:
-    NOW_PLAYING_ICON_NAME = 'media-playback-start-rtl-symbolic'
+NOW_PLAYING_ICON_NAME = 'media-playback-start-symbolic'
 ERROR_ICON_NAME = 'dialog-error-symbolic'