[totem] main: Remove RTL helpers
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [totem] main: Remove RTL helpers
- Date: Fri, 30 May 2014 17:51:16 +0000 (UTC)
commit d0bf95742351ed8ee56eb4c037ffc2101636fc8c
Author: Bastien Nocera <hadess hadess net>
Date: Fri May 30 19:49:11 2014 +0200
main: Remove RTL helpers
The code now lives directly in GTK+'s GtkIconTheme handling.
src/Makefile.am | 3 +-
src/gst/Makefile.am | 19 +------------
src/gst/totem-rtl-helpers.c | 61 -------------------------------------------
src/gst/totem-rtl-helpers.h | 35 ------------------------
src/totem-grilo.c | 1 -
src/totem-playlist.c | 3 +-
6 files changed, 3 insertions(+), 119 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index f1a5dd4..54598cf 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -44,8 +44,7 @@ libtotem_player_la_CPPFLAGS = \
libtotem_player_la_LIBADD = \
$(PLAYER_LIBS) \
- gst/libtotemtimehelpers.la \
- gst/libtotemrtlhelpers.la
+ gst/libtotemtimehelpers.la
libtotem_player_la_CFLAGS = \
$(LIBPLAYER_CFLAGS) \
diff --git a/src/gst/Makefile.am b/src/gst/Makefile.am
index 4529192..76998cc 100644
--- a/src/gst/Makefile.am
+++ b/src/gst/Makefile.am
@@ -1,8 +1,7 @@
noinst_LTLIBRARIES = \
libtotemgsthelpers.la \
libtotemgstpixbufhelpers.la \
- libtotemtimehelpers.la \
- libtotemrtlhelpers.la
+ libtotemtimehelpers.la
libtotemgsthelpers_la_SOURCES = \
totem-gst-helpers.c \
@@ -52,22 +51,6 @@ libtotemtimehelpers_la_CFLAGS = \
libtotemtimehelpers_la_LIBADD = $(TIME_HELPER_LIBS)
libtotemtimehelpers_la_LDFLAGS= -no-undefined
-libtotemrtlhelpers_la_SOURCES = \
- totem-rtl-helpers.c \
- totem-rtl-helpers.h
-
-libtotemrtlhelpers_la_CPPFLAGS = \
- -D_REENTRANT \
- $(DISABLE_DEPRECATED) \
- $(AM_CPPFLAGS)
-
-libtotemrtlhelpers_la_CFLAGS = \
- $(RTL_HELPER_CFLAGS) \
- $(AM_CFLAGS)
-
-libtotemrtlhelpers_la_LIBADD = $(RTL_HELPER_LIBS)
-libtotemrtlhelpers_la_LDFLAGS= -no-undefined
-
include $(top_srcdir)/Makefile.decl
pwd=`pwd`
diff --git a/src/totem-grilo.c b/src/totem-grilo.c
index 02ff025..349ef7e 100644
--- a/src/totem-grilo.c
+++ b/src/totem-grilo.c
@@ -42,7 +42,6 @@
#include <totem-private.h>
#include <totem-time-helpers.h>
-#include <totem-rtl-helpers.h>
#include "totem-grilo.h"
#include "totem-search-entry.h"
diff --git a/src/totem-playlist.c b/src/totem-playlist.c
index 7297b78..10af54b 100644
--- a/src/totem-playlist.c
+++ b/src/totem-playlist.c
@@ -33,7 +33,6 @@
#include "totem-uri.h"
#include "totem-interface.h"
-#include "totem-rtl-helpers.h"
#define PL_LEN (gtk_tree_model_iter_n_children (playlist->priv->model, NULL))
@@ -561,7 +560,7 @@ set_playing_icon (GtkTreeViewColumn *column, GtkCellRenderer *renderer,
switch (playing) {
case TOTEM_PLAYLIST_STATUS_PLAYING:
- icon_name = totem_get_rtl_icon_name ("media-playback-start");
+ icon_name = "media-playback-start";
break;
case TOTEM_PLAYLIST_STATUS_PAUSED:
icon_name = "media-playback-pause-symbolic";
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]