[totem] all: Revert all totem_set_popover_no_shadow() bits



commit d732c0bc1128577154d4e8285ac967e78214e4f6
Author: Carlos Garnacho <carlosg gnome org>
Date:   Mon Mar 24 11:13:51 2014 +0100

    all: Revert all totem_set_popover_no_shadow() bits
    
    Since GTK+ commit eb0f86d48, this hack is no longer necessary as
    GtkPopover sets invariably a more fitting shape.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=726927

 src/Makefile.am                          |    4 +-
 src/backend/Makefile.am                  |    3 +-
 src/backend/bacon-video-controls-actor.c |    3 --
 src/gst/Makefile.am                      |   19 +---------
 src/gst/totem-style-helpers.c            |   58 ------------------------------
 src/gst/totem-style-helpers.h            |   35 ------------------
 src/totem-object.c                       |    4 --
 7 files changed, 4 insertions(+), 122 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 846db6d..f1a5dd4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -45,8 +45,8 @@ libtotem_player_la_CPPFLAGS =         \
 libtotem_player_la_LIBADD =            \
        $(PLAYER_LIBS)                  \
        gst/libtotemtimehelpers.la      \
-       gst/libtotemrtlhelpers.la       \
-       gst/libtotemstylehelpers.la
+       gst/libtotemrtlhelpers.la
+
 libtotem_player_la_CFLAGS =    \
        $(LIBPLAYER_CFLAGS)     \
        -I$(srcdir)/gst/        \
diff --git a/src/backend/Makefile.am b/src/backend/Makefile.am
index 18c2160..1df90a5 100644
--- a/src/backend/Makefile.am
+++ b/src/backend/Makefile.am
@@ -18,8 +18,7 @@ bvw_test_CFLAGS =             \
 bvw_test_LDADD =                                       \
        libbaconvideowidget.la                          \
        $(BACKEND_LIBS)                                 \
-       $(top_builddir)/src/gst/libtotemtimehelpers.la  \
-       $(top_builddir)/src/gst/libtotemstylehelpers.la
+       $(top_builddir)/src/gst/libtotemtimehelpers.la
 
 # Enums
 BVW_ENUM_FILES = bacon-video-widget-enums.c bacon-video-widget-enums.h
diff --git a/src/backend/bacon-video-controls-actor.c b/src/backend/bacon-video-controls-actor.c
index f107c26..40cd27e 100644
--- a/src/backend/bacon-video-controls-actor.c
+++ b/src/backend/bacon-video-controls-actor.c
@@ -23,7 +23,6 @@
 
 #include "bacon-video-controls-actor.h"
 #include "bacon-time-label.h"
-#include "totem-style-helpers.h"
 
 #define BACON_VIDEO_CONTROLS_ACTOR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), 
BACON_TYPE_VIDEO_CONTROLS_ACTOR, BaconVideoControlsActorPrivate))
 
@@ -108,8 +107,6 @@ bacon_video_controls_actor_init (BaconVideoControlsActor *controls)
        setup_object (controls, "volume_button");
        setup_object (controls, "time_label");
        setup_object (controls, "time_rem_label");
-
-       totem_set_popover_no_shadow (g_object_get_data (G_OBJECT (controls), "volume_button"));
 }
 
 ClutterActor *
diff --git a/src/gst/Makefile.am b/src/gst/Makefile.am
index 2c2124f..4529192 100644
--- a/src/gst/Makefile.am
+++ b/src/gst/Makefile.am
@@ -2,8 +2,7 @@ noinst_LTLIBRARIES =                    \
        libtotemgsthelpers.la           \
        libtotemgstpixbufhelpers.la     \
        libtotemtimehelpers.la          \
-       libtotemrtlhelpers.la           \
-       libtotemstylehelpers.la
+       libtotemrtlhelpers.la
 
 libtotemgsthelpers_la_SOURCES =        \
        totem-gst-helpers.c     \
@@ -53,22 +52,6 @@ libtotemtimehelpers_la_CFLAGS =      \
 libtotemtimehelpers_la_LIBADD = $(TIME_HELPER_LIBS)
 libtotemtimehelpers_la_LDFLAGS= -no-undefined
 
-libtotemstylehelpers_la_SOURCES =      \
-       totem-style-helpers.c           \
-       totem-style-helpers.h
-
-libtotemstylehelpers_la_CPPFLAGS =     \
-       -D_REENTRANT                    \
-       $(DISABLE_DEPRECATED)           \
-       $(AM_CPPFLAGS)
-
-libtotemstylehelpers_la_CFLAGS =       \
-       $(RTL_HELPER_CFLAGS)    \
-       $(AM_CFLAGS)
-
-libtotemstylehelpers_la_LIBADD = $(RTL_HELPER_LIBS)
-libtotemstylehelpers_la_LDFLAGS= -no-undefined
-
 libtotemrtlhelpers_la_SOURCES =        \
        totem-rtl-helpers.c             \
        totem-rtl-helpers.h
diff --git a/src/totem-object.c b/src/totem-object.c
index d9fee60..6712026 100644
--- a/src/totem-object.c
+++ b/src/totem-object.c
@@ -64,7 +64,6 @@
 #include "totem-preferences.h"
 #include "totem-session.h"
 #include "totem-rtl-helpers.h"
-#include "totem-style-helpers.h"
 #include "totem-main-toolbar.h"
 
 #define WANT_MIME_TYPES 1
@@ -3496,7 +3495,6 @@ totem_callback_connect (TotemObject *totem)
        item = g_object_get_data (totem->controls, "go_button");
        menu = (GMenuModel *) gtk_builder_get_object (totem->xml, "gomenu");
        gtk_menu_button_set_menu_model (GTK_MENU_BUTTON (item), menu);
-       totem_set_popover_no_shadow (item);
 
        /* Cog wheel */
        item = totem->gear_button = totem_interface_create_header_button (totem->header,
@@ -3506,7 +3504,6 @@ totem_callback_connect (TotemObject *totem)
        g_object_set (G_OBJECT (totem->gear_button), "use-popover", TRUE, NULL);
        menu = (GMenuModel *) gtk_builder_get_object (totem->xml, "playermenu");
        gtk_menu_button_set_menu_model (GTK_MENU_BUTTON (item), menu);
-       totem_set_popover_no_shadow (item);
        g_signal_connect (G_OBJECT (item), "toggled",
                          G_CALLBACK (fullscreen_menu_shown_cb), totem);
 
@@ -3669,7 +3666,6 @@ add_fullscreen_toolbar (TotemObject *totem)
        g_object_set (G_OBJECT (item), "use-popover", TRUE, NULL);
        menu = (GMenuModel *) gtk_builder_get_object (totem->xml, "playermenu");
        gtk_menu_button_set_menu_model (GTK_MENU_BUTTON (item), menu);
-       totem_set_popover_no_shadow (item);
        g_signal_connect (G_OBJECT (item), "toggled",
                          G_CALLBACK (fullscreen_menu_shown_cb), totem);
        totem->fullscreen_gear_button = item;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]