Updating branch refs/heads/master to f1f727cfa13fdc345f44353ecd0ef86d07f36509 (commit) from 107c5ac67a3fbf933a4735282f464a1054c1ac24 (commit)
commit f1f727cfa13fdc345f44353ecd0ef86d07f36509 Author: Simon Steinbeiss <simon.steinbe...@elfenbeinturm.at> Date: Tue Aug 20 14:00:47 2013 +0200 Drop gtkrc file data/Makefile.am | 1 - data/gtk-2.0/Makefile.am | 7 ------- data/gtk-2.0/parole.gtkrc | 19 ------------------- src/parole-player.c | 9 --------- 4 files changed, 36 deletions(-) diff --git a/data/Makefile.am b/data/Makefile.am index 4a0719d..6b0d93e 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,5 +1,4 @@ SUBDIRS = \ - gtk-2.0 \ interfaces \ pixmaps \ icons \ diff --git a/data/gtk-2.0/Makefile.am b/data/gtk-2.0/Makefile.am deleted file mode 100644 index ce7ad47..0000000 --- a/data/gtk-2.0/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -EXTRA_DIST = \ - $(gtkrc_DATA) - -gtkrcdir = $(datadir)/parole/gtk-2.0 - -gtkrc_DATA = \ - parole.gtkrc diff --git a/data/gtk-2.0/parole.gtkrc b/data/gtk-2.0/parole.gtkrc deleted file mode 100644 index b1eef3d..0000000 --- a/data/gtk-2.0/parole.gtkrc +++ /dev/null @@ -1,19 +0,0 @@ -style "parole-fullscreen" -{ - fg[NORMAL] = "#EEEEEE" - fg[PRELIGHT] = "#FFFFFF" - - bg[NORMAL] = "#000000" - bg[ACTIVE] = "#6D6D6D" - bg[PRELIGHT] = "#505050" - bg[SELECTED] = "#398EE7" - bg[INSENSITIVE] = "#C4C4C4" -} - -style "parole-scale" = "parole-fullscreen" -{ - bg[NORMAL] = "#CECECE" -} - -widget "*ParoleFullscreen*" style "parole-fullscreen" -widget "*ParoleFullscreen*ParoleScale*" style "parole-scale" diff --git a/src/parole-player.c b/src/parole-player.c index 0df3291..c3c2f2c 100644 --- a/src/parole-player.c +++ b/src/parole-player.c @@ -72,12 +72,6 @@ #include "common/parole-common.h" -#define RC_STYLE \ - "include \"" GTKRC_DIR "/parole.gtkrc\"" - -#define RC_STYLE_FILE \ - GTKRC_DIR "/parole.gtkrc" - int GTK_ICON_SIZE_ARTWORK_FALLBACK; static void @@ -3176,9 +3170,6 @@ parole_player_init (ParolePlayer *player) player->priv->play_pause = GTK_WIDGET (gtk_builder_get_object (builder, "media_play")); player->priv->seekf = GTK_WIDGET (gtk_builder_get_object (builder, "media_next")); player->priv->seekb = GTK_WIDGET (gtk_builder_get_object (builder, "media_prev")); - - // FIXME: parole-player.c:3057:5: warning: ‘gtk_rc_parse’ is deprecated (declared at /usr/include/gtk-3.0/gtk/deprecated/gtkrc.h:172): Use 'GtkStyleContext' instead [-Wdeprecated-declarations] - gtk_rc_parse( RC_STYLE_FILE ); player->priv->range = GTK_WIDGET (gtk_builder_get_object (builder, "media_progress_slider")); gtk_widget_set_name( player->priv->range, "ParoleScale" ); _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits