[Xfce4-commits] <parole:master> Cleanup for full-debug
Sean Davis
noreply at xfce.org
Fri Oct 11 11:50:40 CEST 2013
Updating branch refs/heads/master
to 6717712c86eacb83296c8b979b7115b2a1f61882 (commit)
from 32597d83a30d0c8dc57944b20c1c2ff7a33a4908 (commit)
commit 6717712c86eacb83296c8b979b7115b2a1f61882
Author: Sean Davis <smd.seandavis at gmail.com>
Date: Wed Aug 21 18:53:54 2013 -0400
Cleanup for full-debug
src/gst/parole-gst.c | 66 +-------------------------------------
src/parole-conf-dialog.c | 6 ----
src/parole-player.c | 14 +++-----
src/plugins/tray/tray-provider.c | 7 ++--
4 files changed, 9 insertions(+), 84 deletions(-)
diff --git a/src/gst/parole-gst.c b/src/gst/parole-gst.c
index 5b1baa6..60f8183 100644
--- a/src/gst/parole-gst.c
+++ b/src/gst/parole-gst.c
@@ -513,65 +513,6 @@ parole_gst_set_video_overlay (ParoleGst *gst)
gst_object_unref (video_sink);
}
-static gboolean
-#if GTK_CHECK_VERSION(3, 0, 0)
-parole_gst_expose_event (GtkWidget *widget, cairo_t *cr)
-#else
-parole_gst_expose_event (GtkWidget *widget, GdkEventExpose *ev)
-#endif
-{
- ParoleGst *gst;
-
- gboolean playing_video;
-
- //if ( ev && ev->count > 0 )
- //return TRUE;
-
- gst = PAROLE_GST (widget);
-
- g_object_get (G_OBJECT (gst->priv->stream),
- "has-video", &playing_video,
- NULL);
-
- parole_gst_set_video_overlay (gst);
-
- TRACE ("EXPOSE event state=%d target=%d", gst->priv->state, gst->priv->target);
-
- switch ( gst->priv->state )
- {
- case GST_STATE_PLAYING:
- if ( playing_video || gst->priv->vis_loaded)
- {
-#if GST_CHECK_VERSION(1, 0, 0)
- gst_video_overlay_expose (GST_VIDEO_OVERLAY (gst->priv->video_sink));
-#else
- gst_x_overlay_expose (GST_X_OVERLAY (gst->priv->video_sink));
-#endif
- }
- break;
- case GST_STATE_PAUSED:
- if ( playing_video || gst->priv->vis_loaded || gst->priv->target == GST_STATE_PLAYING )
-#if GST_CHECK_VERSION(1, 0, 0)
- gst_video_overlay_expose (GST_VIDEO_OVERLAY (gst->priv->video_sink));
-#else
- gst_x_overlay_expose (GST_X_OVERLAY (gst->priv->video_sink));
-#endif
- break;
- case GST_STATE_READY:
- if (!(gst->priv->target != GST_STATE_PLAYING))
-#if GST_CHECK_VERSION(1, 0, 0)
- gst_video_overlay_expose (GST_VIDEO_OVERLAY (gst->priv->video_sink));
-#else
- gst_x_overlay_expose (GST_X_OVERLAY (gst->priv->video_sink));
-#endif
- break;
- case GST_STATE_NULL:
- case GST_STATE_VOID_PENDING:
- break;
- }
- return TRUE;
-}
-
static void
parole_gst_query_capabilities (ParoleGst *gst)
{
@@ -2309,12 +2250,7 @@ parole_gst_class_init (ParoleGstClass *klass)
widget_class->realize = parole_gst_realize;
widget_class->show = parole_gst_show;
widget_class->size_allocate = parole_gst_size_allocate;
-#if GTK_CHECK_VERSION(3, 0, 0)
- // FIXME: parole-gst.c:2429:24: warning: assignment from incompatible pointer type [enabled by default]
- //widget_class->draw = parole_gst_expose_event;
-#else
- widget_class->expose_event = parole_gst_expose_event;
-#endif
+
widget_class->motion_notify_event = parole_gst_motion_notify_event;
widget_class->button_press_event = parole_gst_button_press_event;
widget_class->button_release_event = parole_gst_button_release_event;
diff --git a/src/parole-conf-dialog.c b/src/parole-conf-dialog.c
index fb2a22c..12c2800 100644
--- a/src/parole-conf-dialog.c
+++ b/src/parole-conf-dialog.c
@@ -251,17 +251,11 @@ void parole_conf_dialog_vis_plugin_changed_cb (GtkComboBox *widget, ParoleConfD
gchar *active;
GstElementFactory *f;
-#if GTK_CHECK_VERSION(3, 0, 0)
GtkTreeIter iter;
- gchar *text = NULL;
-
GtkTreeModel *model = gtk_combo_box_get_model(widget);
if (gtk_combo_box_get_active_iter (widget, &iter))
gtk_tree_model_get (model, &iter, 0, &active, -1);
-#else
- active = gtk_combo_box_get_active_text (widget);
-#endif
f = g_hash_table_lookup (self->priv->vis_plugins, active);
diff --git a/src/parole-player.c b/src/parole-player.c
index 4853390..9b9064e 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -155,10 +155,6 @@ gboolean parole_player_window_state_event (GtkWidget *widget,
void parole_player_leave_fs_cb (GtkButton *button,
ParolePlayer *player);
-
-gboolean parole_player_window_state_event (GtkWidget *widget,
- GdkEventWindowState *event,
- ParolePlayer *player);
void parole_player_destroy_cb (GObject *window,
ParolePlayer *player);
@@ -1259,9 +1255,9 @@ parole_player_set_playpause_button_image (GtkWidget *widget, const gchar *stock_
GtkWidget *img;
gchar *icon_name = NULL;
- if (stock_id == GTK_STOCK_MEDIA_PLAY) {
+ if (g_strcmp0(stock_id, GTK_STOCK_MEDIA_PLAY) == 0) {
icon_name = g_strdup("media-playback-start-symbolic");
- } else if (stock_id == GTK_STOCK_MEDIA_PAUSE) {
+ } else if (g_strcmp0(stock_id, GTK_STOCK_MEDIA_PAUSE) == 0) {
icon_name = g_strdup("media-playback-pause-symbolic");
}
@@ -1441,6 +1437,7 @@ parole_player_quit (ParolePlayer *player)
static void
parole_player_stopped (ParolePlayer *player)
{
+ gchar dur_text[128];
TRACE ("Player stopped");
gtk_widget_set_sensitive (player->priv->play_pause,
@@ -1453,7 +1450,7 @@ parole_player_stopped (ParolePlayer *player)
gtk_widget_hide(player->priv->audiobox);
gtk_widget_show(player->priv->logo_image);
- gchar dur_text[128];
+
get_time_string (dur_text, 0);
gtk_label_set_text (GTK_LABEL (player->priv->label_duration), dur_text);
@@ -2918,8 +2915,7 @@ parole_player_init (ParolePlayer *player)
GtkStyleContext *fullscreen_mode;
gint volume;
-
- GtkWidget *hbox_audiobox;
+
GtkWidget *hpaned;
GtkWidget *recent_menu;
diff --git a/src/plugins/tray/tray-provider.c b/src/plugins/tray/tray-provider.c
index db401fa..613dc35 100644
--- a/src/plugins/tray/tray-provider.c
+++ b/src/plugins/tray/tray-provider.c
@@ -242,7 +242,7 @@ configure_plugin (TrayProvider *tray, GtkWidget *widget)
g_signal_connect (hide_on_delete, "toggled",
G_CALLBACK (hide_on_delete_toggled_cb), NULL);
- gtk_box_pack_start_defaults (GTK_BOX (content_area), hide_on_delete);
+ gtk_box_pack_start (GTK_BOX (content_area), hide_on_delete, TRUE, TRUE, 0);
g_signal_connect (dialog, "response",
G_CALLBACK (gtk_widget_destroy), NULL);
@@ -310,9 +310,8 @@ delete_event_cb (GtkWidget *widget, GdkEvent *ev, TrayProvider *tray)
g_signal_connect (check, "toggled",
G_CALLBACK (action_on_hide_confirmed_cb), NULL);
-
- gtk_box_pack_start_defaults (GTK_BOX (content_area),
- check) ;
+
+ gtk_box_pack_start (GTK_BOX (content_area), check, TRUE, TRUE, 0);
gtk_widget_show_all( GTK_WIDGET(dialog) );
More information about the Xfce4-commits
mailing list