[totem] Fixed some strict gcc warnings
- From: Philip Withnall <pwithnall src gnome org>
- To: svn-commits-list gnome org
- Subject: [totem] Fixed some strict gcc warnings
- Date: Sat, 18 Jul 2009 18:38:30 +0000 (UTC)
commit cce286bf32d4b800000aa9f731adbd8574ca5339
Author: Philip Withnall <philip tecnocode co uk>
Date: Sat Jul 18 19:32:09 2009 +0100
Fixed some strict gcc warnings
2009-07-18 Philip Withnall <philip tecnocode co uk>
* src/backend/bacon-resize.c (bacon_resize_resize),
(bacon_resize_restore):
* src/backend/bacon-video-widget-gst-0.10.c
(bacon_video_widget_open), (bacon_video_widget_seek_time),
(bacon_video_widget_set_logo):
* src/backend/bacon-video-widget.h:
* src/backend/bvw-test.c (test_bvw_set_mrl), (on_redirect),
(on_eos_event), (main):
* src/backend/video-utils.c (totem_time_to_string),
(totem_time_to_string_text):
* src/plugins/brasero-disc-recorder/totem-disc-recorder.c
(totem_disc_recorder_plugin_start_burning):
* src/plugins/properties/bacon-video-widget-properties.c
(bacon_video_widget_properties_from_time):
* src/plugins/properties/bacon-video-widget-properties.h:
* src/plugins/publish/totem-publish.c
(totem_publish_plugin_playlist_cb):
* src/plugins/screenshot/totem-gallery.c
(dialog_response_callback):
* src/plugins/screenshot/totem-screenshot.c (drag_data_get):
* src/plugins/skipto/totem-skipto-plugin.c
(totem_skipto_update_from_state):
* src/plugins/skipto/totem-skipto.c (totem_skipto_update_range),
(totem_skipto_get_range), (totem_skipto_set_current):
* src/plugins/skipto/totem-skipto.h:
* src/plugins/totem-plugins-engine.c (load_plugin_module),
(totem_plugins_engine_plugin_active_cb),
(totem_plugins_engine_plugin_visible_cb):
* src/plugins/youtube/totem-youtube.c (starting_video_cb):
* src/totem-menu.c (add_lang_action), (totem_action_add_recent):
* src/totem-object.c (totem_get_title_at_playlist_pos),
(totem_action_load_media), (window_state_event_cb),
(totem_action_set_mrl_with_warning), (totem_time_within_seconds),
(totem_seek_time_rel), (drop_video_cb), (drag_motion_video_cb),
(drop_playlist_cb), (drag_motion_playlist_cb), (drag_video_cb),
(seek_slider_changed_cb), (totem_action_set_playlist_index),
(totem_action_remote), (totem_action_handle_key_release),
(window_key_press_event_cb):
* src/totem-options.c (totem_options_process_late):
* src/totem-options.h:
* src/totem-playlist.c (drop_cb), (playlist_show_popup_menu),
(totem_playlist_set_reorderable),
(totem_playlist_clear_with_compare), (totem_playlist_get_title),
(totem_playlist_get_current), (totem_playlist_set_current):
* src/totem-playlist.h:
* src/totem-preferences.c (totem_setup_preferences):
* src/totem-private.h:
* src/totem-session.c (totem_save_state_cb):
* src/totem-statusbar.c (totem_statusbar_update_time),
(totem_statusbar_set_time), (totem_statusbar_set_time_and_length):
* src/totem-subtitle-encoding.c (subtitle_encoding_get_charset),
(subtitle_encoding_create_store),
(totem_subtitle_encoding_get_selected),
(totem_subtitle_encoding_set):
* src/totem-time-label.c (totem_time_label_init),
(totem_time_label_set_time):
* src/totem-video-thumbnailer.c (create_gallery), (main):
* src/totem.c (totem_message_received_cb), (main):
* src/totem.h: Fixed some strict gcc warnings.
ChangeLog | 62 ++++++++++
src/backend/bacon-resize.c | 30 +++---
src/backend/bacon-video-widget-gst-0.10.c | 28 +++---
src/backend/bacon-video-widget.h | 4 +-
src/backend/bvw-test.c | 15 +--
src/backend/video-utils.c | 30 +++---
.../brasero-disc-recorder/totem-disc-recorder.c | 8 +-
.../properties/bacon-video-widget-properties.c | 8 +-
.../properties/bacon-video-widget-properties.h | 4 +-
src/plugins/publish/totem-publish.c | 6 +-
src/plugins/screenshot/totem-gallery.c | 8 +-
src/plugins/screenshot/totem-screenshot.c | 2 +-
src/plugins/skipto/totem-skipto-plugin.c | 6 +-
src/plugins/skipto/totem-skipto.c | 18 ++--
src/plugins/skipto/totem-skipto.h | 4 +-
src/plugins/totem-plugins-engine.c | 8 +-
src/plugins/youtube/totem-youtube.c | 1 -
src/totem-menu.c | 11 +-
src/totem-object.c | 124 +++++++++++---------
src/totem-options.c | 4 +-
src/totem-options.h | 5 +-
src/totem-playlist.c | 57 +++++-----
src/totem-playlist.h | 4 +-
src/totem-preferences.c | 8 +-
src/totem-private.h | 6 +-
src/totem-session.c | 4 +-
src/totem-statusbar.c | 27 ++---
src/totem-subtitle-encoding.c | 31 +++---
src/totem-time-label.c | 21 ++--
src/totem-video-thumbnailer.c | 7 +-
src/totem.c | 4 +-
src/totem.h | 2 +-
32 files changed, 314 insertions(+), 243 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 0787a84..82b055b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,65 @@
+2009-07-18 Philip Withnall <philip tecnocode co uk>
+
+ * src/backend/bacon-resize.c (bacon_resize_resize),
+ (bacon_resize_restore):
+ * src/backend/bacon-video-widget-gst-0.10.c
+ (bacon_video_widget_open), (bacon_video_widget_seek_time),
+ (bacon_video_widget_set_logo):
+ * src/backend/bacon-video-widget.h:
+ * src/backend/bvw-test.c (test_bvw_set_mrl), (on_redirect),
+ (on_eos_event), (main):
+ * src/backend/video-utils.c (totem_time_to_string),
+ (totem_time_to_string_text):
+ * src/plugins/brasero-disc-recorder/totem-disc-recorder.c
+ (totem_disc_recorder_plugin_start_burning):
+ * src/plugins/properties/bacon-video-widget-properties.c
+ (bacon_video_widget_properties_from_time):
+ * src/plugins/properties/bacon-video-widget-properties.h:
+ * src/plugins/publish/totem-publish.c
+ (totem_publish_plugin_playlist_cb):
+ * src/plugins/screenshot/totem-gallery.c
+ (dialog_response_callback):
+ * src/plugins/screenshot/totem-screenshot.c (drag_data_get):
+ * src/plugins/skipto/totem-skipto-plugin.c
+ (totem_skipto_update_from_state):
+ * src/plugins/skipto/totem-skipto.c (totem_skipto_update_range),
+ (totem_skipto_get_range), (totem_skipto_set_current):
+ * src/plugins/skipto/totem-skipto.h:
+ * src/plugins/totem-plugins-engine.c (load_plugin_module),
+ (totem_plugins_engine_plugin_active_cb),
+ (totem_plugins_engine_plugin_visible_cb):
+ * src/plugins/youtube/totem-youtube.c (starting_video_cb):
+ * src/totem-menu.c (add_lang_action), (totem_action_add_recent):
+ * src/totem-object.c (totem_get_title_at_playlist_pos),
+ (totem_action_load_media), (window_state_event_cb),
+ (totem_action_set_mrl_with_warning), (totem_time_within_seconds),
+ (totem_seek_time_rel), (drop_video_cb), (drag_motion_video_cb),
+ (drop_playlist_cb), (drag_motion_playlist_cb), (drag_video_cb),
+ (seek_slider_changed_cb), (totem_action_set_playlist_index),
+ (totem_action_remote), (totem_action_handle_key_release),
+ (window_key_press_event_cb):
+ * src/totem-options.c (totem_options_process_late):
+ * src/totem-options.h:
+ * src/totem-playlist.c (drop_cb), (playlist_show_popup_menu),
+ (totem_playlist_set_reorderable),
+ (totem_playlist_clear_with_compare), (totem_playlist_get_title),
+ (totem_playlist_get_current), (totem_playlist_set_current):
+ * src/totem-playlist.h:
+ * src/totem-preferences.c (totem_setup_preferences):
+ * src/totem-private.h:
+ * src/totem-session.c (totem_save_state_cb):
+ * src/totem-statusbar.c (totem_statusbar_update_time),
+ (totem_statusbar_set_time), (totem_statusbar_set_time_and_length):
+ * src/totem-subtitle-encoding.c (subtitle_encoding_get_charset),
+ (subtitle_encoding_create_store),
+ (totem_subtitle_encoding_get_selected),
+ (totem_subtitle_encoding_set):
+ * src/totem-time-label.c (totem_time_label_init),
+ (totem_time_label_set_time):
+ * src/totem-video-thumbnailer.c (create_gallery), (main):
+ * src/totem.c (totem_message_received_cb), (main):
+ * src/totem.h: Fixed some strict gcc warnings.
+
2009-07-18 Robin Stocker <robin nibor org>
* src/totem-object.c (drop_video_cb, drop_playlist_cb):
diff --git a/src/backend/bacon-resize.c b/src/backend/bacon-resize.c
index e4a7253..0e5eead 100644
--- a/src/backend/bacon-resize.c
+++ b/src/backend/bacon-resize.c
@@ -218,16 +218,16 @@ bacon_resize_resize (BaconResize *resize)
gboolean found = FALSE;
GdkWindow *root;
GdkScreen *screen;
- Display *Display;
+ Display *xdisplay;
g_return_if_fail (GTK_IS_WIDGET (resize->priv->video_widget));
g_return_if_fail (GTK_WIDGET_REALIZED (resize->priv->video_widget));
- Display = GDK_DRAWABLE_XDISPLAY (resize->priv->video_widget->window);
- if (Display == NULL)
+ xdisplay = GDK_DRAWABLE_XDISPLAY (resize->priv->video_widget->window);
+ if (xdisplay == NULL)
return;
- XLockDisplay (Display);
+ XLockDisplay (xdisplay);
screen = gtk_widget_get_screen (resize->priv->video_widget);
root = gdk_screen_get_root_window (screen);
@@ -236,7 +236,7 @@ bacon_resize_resize (BaconResize *resize)
if (gdk_screen_get_n_monitors (screen) > 1)
goto bail;
- res = XF86VidModeGetModeLine (Display, GDK_SCREEN_XNUMBER (screen), &dotclock, &modeline);
+ res = XF86VidModeGetModeLine (xdisplay, GDK_SCREEN_XNUMBER (screen), &dotclock, &modeline);
if (!res)
goto bail;
@@ -250,7 +250,7 @@ bacon_resize_resize (BaconResize *resize)
gdk_error_trap_push ();
/* Find the XRandR mode that corresponds to the real size */
- resize->priv->xr_screen_conf = XRRGetScreenInfo (Display, GDK_WINDOW_XWINDOW (root));
+ resize->priv->xr_screen_conf = XRRGetScreenInfo (xdisplay, GDK_WINDOW_XWINDOW (root));
xr_sizes = XRRConfigSizes (resize->priv->xr_screen_conf, &xr_nsize);
resize->priv->xr_original_size = XRRConfigCurrentConfiguration (resize->priv->xr_screen_conf, &(resize->priv->xr_current_rotation));
if (gdk_error_trap_pop ()) {
@@ -269,7 +269,7 @@ bacon_resize_resize (BaconResize *resize)
goto bail;
gdk_error_trap_push ();
- XRRSetScreenConfig (Display,
+ XRRSetScreenConfig (xdisplay,
resize->priv->xr_screen_conf,
GDK_WINDOW_XWINDOW (root),
(SizeID) i,
@@ -282,7 +282,7 @@ bacon_resize_resize (BaconResize *resize)
resize->priv->resized = TRUE;
bail:
- XUnlockDisplay (Display);
+ XUnlockDisplay (xdisplay);
#endif /* HAVE_XVIDMODE */
}
@@ -294,7 +294,7 @@ bacon_resize_restore (BaconResize *resize)
XF86VidModeModeLine modeline;
GdkWindow *root;
GdkScreen *screen;
- Display *Display;
+ Display *xdisplay;
g_return_if_fail (GTK_IS_WIDGET (resize->priv->video_widget));
g_return_if_fail (GTK_WIDGET_REALIZED (resize->priv->video_widget));
@@ -304,15 +304,15 @@ bacon_resize_restore (BaconResize *resize)
if (resize->priv->xr_screen_conf == NULL)
return;
- Display = GDK_DRAWABLE_XDISPLAY (resize->priv->video_widget->window);
- if (Display == NULL)
+ xdisplay = GDK_DRAWABLE_XDISPLAY (resize->priv->video_widget->window);
+ if (xdisplay == NULL)
return;
- XLockDisplay (Display);
+ XLockDisplay (xdisplay);
screen = gtk_widget_get_screen (resize->priv->video_widget);
root = gdk_screen_get_root_window (screen);
- res = XF86VidModeGetModeLine (Display, GDK_SCREEN_XNUMBER (screen), &dotclock, &modeline);
+ res = XF86VidModeGetModeLine (xdisplay, GDK_SCREEN_XNUMBER (screen), &dotclock, &modeline);
if (!res)
goto bail;
@@ -324,7 +324,7 @@ bacon_resize_restore (BaconResize *resize)
goto bail;
gdk_error_trap_push ();
- XRRSetScreenConfig (Display,
+ XRRSetScreenConfig (xdisplay,
resize->priv->xr_screen_conf,
GDK_WINDOW_XWINDOW (root),
resize->priv->xr_original_size,
@@ -340,7 +340,7 @@ bacon_resize_restore (BaconResize *resize)
resize->priv->xr_screen_conf = NULL;
bail:
- XUnlockDisplay (Display);
+ XUnlockDisplay (xdisplay);
#endif
}
diff --git a/src/backend/bacon-video-widget-gst-0.10.c b/src/backend/bacon-video-widget-gst-0.10.c
index 9301e40..4d77e17 100644
--- a/src/backend/bacon-video-widget-gst-0.10.c
+++ b/src/backend/bacon-video-widget-gst-0.10.c
@@ -91,6 +91,8 @@
(e->domain == GST_##d##_ERROR && \
e->code == GST_##d##_ERROR_##c)
+G_DEFINE_TYPE (BaconVideoWidget, bacon_video_widget, GTK_TYPE_EVENT_BOX)
+
/* Signals */
enum
{
@@ -3222,16 +3224,16 @@ bacon_video_widget_open (BaconVideoWidget * bvw,
if (g_strrstr (bvw->priv->mrl, "#subtitle:")) {
gchar **uris;
- gchar *subtitle_uri;
+ gchar *new_subtitle_uri;
uris = g_strsplit (bvw->priv->mrl, "#subtitle:", 2);
/* Try to fix subtitle uri if needed */
if (uris[1][0] == '/') {
- subtitle_uri = g_strdup_printf ("file://%s", uris[1]);
+ new_subtitle_uri = g_strdup_printf ("file://%s", uris[1]);
}
else {
if (strchr (uris[1], ':')) {
- subtitle_uri = g_strdup (uris[1]);
+ new_subtitle_uri = g_strdup (uris[1]);
} else {
gchar *cur_dir = g_get_current_dir ();
if (!cur_dir) {
@@ -3239,13 +3241,13 @@ bacon_video_widget_open (BaconVideoWidget * bvw,
_("Failed to retrieve working directory"));
return FALSE;
}
- subtitle_uri = g_strdup_printf ("file://%s/%s", cur_dir, uris[1]);
+ new_subtitle_uri = g_strdup_printf ("file://%s/%s", cur_dir, uris[1]);
g_free (cur_dir);
}
}
g_object_set (bvw->priv->play, "uri", bvw->priv->mrl,
- "suburi", subtitle_uri, NULL);
- g_free (subtitle_uri);
+ "suburi", new_subtitle_uri, NULL);
+ g_free (new_subtitle_uri);
g_strfreev (uris);
} else {
g_object_set (bvw->priv->play, "uri", bvw->priv->mrl,
@@ -3401,15 +3403,15 @@ bacon_video_widget_can_direct_seek (BaconVideoWidget *bvw)
* Return value: %TRUE on success, %FALSE otherwise
**/
gboolean
-bacon_video_widget_seek_time (BaconVideoWidget *bvw, gint64 time, GError **error)
+bacon_video_widget_seek_time (BaconVideoWidget *bvw, gint64 _time, GError **error)
{
g_return_val_if_fail (bvw != NULL, FALSE);
g_return_val_if_fail (BACON_IS_VIDEO_WIDGET (bvw), FALSE);
g_return_val_if_fail (GST_IS_ELEMENT (bvw->priv->play), FALSE);
- GST_LOG ("Seeking to %" GST_TIME_FORMAT, GST_TIME_ARGS (time * GST_MSECOND));
+ GST_LOG ("Seeking to %" GST_TIME_FORMAT, GST_TIME_ARGS (_time * GST_MSECOND));
- if (time > bvw->priv->stream_length
+ if (_time > bvw->priv->stream_length
&& bvw->priv->stream_length > 0
&& !g_str_has_prefix (bvw->priv->mrl, "dvd:")
&& !g_str_has_prefix (bvw->priv->mrl, "vcd:")) {
@@ -3419,11 +3421,11 @@ bacon_video_widget_seek_time (BaconVideoWidget *bvw, gint64 time, GError **error
}
/* Emit a time tick of where we are going, we are paused */
- got_time_tick (bvw->priv->play, time * GST_MSECOND, bvw);
+ got_time_tick (bvw->priv->play, _time * GST_MSECOND, bvw);
gst_element_seek (bvw->priv->play, 1.0,
GST_FORMAT_TIME, GST_SEEK_FLAG_FLUSH | GST_SEEK_FLAG_KEY_UNIT,
- GST_SEEK_TYPE_SET, time * GST_MSECOND,
+ GST_SEEK_TYPE_SET, _time * GST_MSECOND,
GST_SEEK_TYPE_NONE, GST_CLOCK_TIME_NONE);
gst_element_get_state (bvw->priv->play, NULL, NULL, 100 * GST_MSECOND);
@@ -3665,7 +3667,7 @@ bacon_video_widget_dvd_event (BaconVideoWidget * bvw,
* Sets the logo displayed on the video widget when no stream is loaded.
**/
void
-bacon_video_widget_set_logo (BaconVideoWidget * bvw, gchar * filename)
+bacon_video_widget_set_logo (BaconVideoWidget * bvw, const gchar * filename)
{
GError *error = NULL;
@@ -5779,8 +5781,6 @@ cb_gconf (GConfClient * client,
/* */
/* =========================================== */
-G_DEFINE_TYPE(BaconVideoWidget, bacon_video_widget, GTK_TYPE_EVENT_BOX)
-
/* applications must use exactly one of bacon_video_widget_get_option_group()
* OR bacon_video_widget_init_backend(), but not both */
diff --git a/src/backend/bacon-video-widget.h b/src/backend/bacon-video-widget.h
index 112c710..d4ffd0c 100644
--- a/src/backend/bacon-video-widget.h
+++ b/src/backend/bacon-video-widget.h
@@ -181,7 +181,7 @@ gboolean bacon_video_widget_seek (BaconVideoWidget *bvw,
double position,
GError **error);
gboolean bacon_video_widget_seek_time (BaconVideoWidget *bvw,
- gint64 time,
+ gint64 _time,
GError **error);
gboolean bacon_video_widget_step (BaconVideoWidget *bvw,
GError **error);
@@ -201,7 +201,7 @@ double bacon_video_widget_get_volume (BaconVideoWidget *bvw);
/* Properties */
void bacon_video_widget_set_logo (BaconVideoWidget *bvw,
- char *filename);
+ const char *filename);
void bacon_video_widget_set_logo_pixbuf (BaconVideoWidget *bvw,
GdkPixbuf *logo);
void bacon_video_widget_set_logo_mode (BaconVideoWidget *bvw,
diff --git a/src/backend/bvw-test.c b/src/backend/bvw-test.c
index 38c7c64..4cde296 100644
--- a/src/backend/bvw-test.c
+++ b/src/backend/bvw-test.c
@@ -8,31 +8,29 @@
#include <X11/Xlib.h>
#endif
-static GtkWidget *win;
-static GtkWidget *bvw;
static char *mrl, *argument;
static void
-test_bvw_set_mrl (const char *path)
+test_bvw_set_mrl (GtkWidget *bvw, const char *path)
{
mrl = g_strdup (path);
bacon_video_widget_open (BACON_VIDEO_WIDGET (bvw), mrl, NULL, NULL);
}
static void
-on_redirect (GtkWidget *bvw, const char *mrl, gpointer data)
+on_redirect (GtkWidget *bvw, const char *redirect_mrl, gpointer data)
{
- g_message ("Redirect to: %s", mrl);
+ g_message ("Redirect to: %s", redirect_mrl);
}
static void
-on_eos_event (GtkWidget *widget, gpointer user_data)
+on_eos_event (GtkWidget *bvw, gpointer user_data)
{
bacon_video_widget_stop (BACON_VIDEO_WIDGET (bvw));
bacon_video_widget_close (BACON_VIDEO_WIDGET (bvw));
g_free (mrl);
- test_bvw_set_mrl (argument);
+ test_bvw_set_mrl (bvw, argument);
bacon_video_widget_play (BACON_VIDEO_WIDGET (bvw), NULL);
}
@@ -73,6 +71,7 @@ error_cb (GtkWidget *bvw, const char *message,
int main
(int argc, char **argv)
{
+ GtkWidget *win, *bvw;
guint32 height = 500;
guint32 width = 500;
@@ -112,7 +111,7 @@ int main
gtk_widget_show (bvw);
mrl = NULL;
- test_bvw_set_mrl (argv[1] ? argv[1] : LOGO_PATH);
+ test_bvw_set_mrl (bvw, argv[1] ? argv[1] : LOGO_PATH);
argument = g_strdup (argv[1] ? argv[1] : LOGO_PATH);
bacon_video_widget_play (BACON_VIDEO_WIDGET (bvw), NULL);
gtk_main ();
diff --git a/src/backend/video-utils.c b/src/backend/video-utils.c
index 1a3783c..65130ec 100644
--- a/src/backend/video-utils.c
+++ b/src/backend/video-utils.c
@@ -71,14 +71,14 @@ totem_display_is_local (void)
char *
totem_time_to_string (gint64 msecs)
{
- int sec, min, hour, time;
+ int sec, min, hour, _time;
- time = (int) (msecs / 1000);
- sec = time % 60;
- time = time - sec;
- min = (time % (60*60)) / 60;
- time = time - (min * 60);
- hour = time / (60*60);
+ _time = (int) (msecs / 1000);
+ sec = _time % 60;
+ _time = _time - sec;
+ min = (_time % (60*60)) / 60;
+ _time = _time - (min * 60);
+ hour = _time / (60*60);
if (hour > 0)
{
@@ -126,14 +126,14 @@ char *
totem_time_to_string_text (gint64 msecs)
{
char *secs, *mins, *hours, *string;
- int sec, min, hour, time;
-
- time = (int) (msecs / 1000);
- sec = time % 60;
- time = time - sec;
- min = (time % (60*60)) / 60;
- time = time - (min * 60);
- hour = time / (60*60);
+ int sec, min, hour, _time;
+
+ _time = (int) (msecs / 1000);
+ sec = _time % 60;
+ _time = _time - sec;
+ min = (_time % (60*60)) / 60;
+ _time = _time - (min * 60);
+ hour = _time / (60*60);
hours = g_strdup_printf (ngettext ("%d hour", "%d hours", hour), hour);
diff --git a/src/plugins/brasero-disc-recorder/totem-disc-recorder.c b/src/plugins/brasero-disc-recorder/totem-disc-recorder.c
index 85dd3a8..4402fec 100644
--- a/src/plugins/brasero-disc-recorder/totem-disc-recorder.c
+++ b/src/plugins/brasero-disc-recorder/totem-disc-recorder.c
@@ -97,11 +97,11 @@ totem_disc_recorder_plugin_start_burning (TotemDiscRecorderPlugin *pi,
gboolean ret;
array = g_ptr_array_new ();
- g_ptr_array_add (array, "brasero");
+ g_ptr_array_add (array, (gpointer) "brasero");
if (copy != FALSE)
- g_ptr_array_add (array, "-c");
+ g_ptr_array_add (array, (gpointer) "-c");
else
- g_ptr_array_add (array, "-r");
+ g_ptr_array_add (array, (gpointer) "-r");
g_ptr_array_add (array, (gpointer) path);
main_window = totem_get_main_window (pi->totem);
@@ -109,7 +109,7 @@ totem_disc_recorder_plugin_start_burning (TotemDiscRecorderPlugin *pi,
int xid;
xid = gdk_x11_drawable_get_xid (GDK_DRAWABLE (GTK_WIDGET (main_window)->window));
xid_str = g_strdup_printf ("%d", xid);
- g_ptr_array_add (array, "-x");
+ g_ptr_array_add (array, (gpointer) "-x");
g_ptr_array_add (array, xid_str);
} else {
xid_str = NULL;
diff --git a/src/plugins/properties/bacon-video-widget-properties.c b/src/plugins/properties/bacon-video-widget-properties.c
index abff0ce..8f3f9c2 100644
--- a/src/plugins/properties/bacon-video-widget-properties.c
+++ b/src/plugins/properties/bacon-video-widget-properties.c
@@ -177,21 +177,21 @@ bacon_video_widget_properties_reset (BaconVideoWidgetProperties *props)
void
bacon_video_widget_properties_from_time (BaconVideoWidgetProperties *props,
- int time)
+ int _time)
{
char *string;
g_return_if_fail (props != NULL);
g_return_if_fail (BACON_IS_VIDEO_WIDGET_PROPERTIES (props));
- if (time == props->priv->time)
+ if (_time == props->priv->time)
return;
- string = totem_time_to_string_text (time);
+ string = totem_time_to_string_text (_time);
bacon_video_widget_properties_set_label (props, "duration", string);
g_free (string);
- props->priv->time = time;
+ props->priv->time = _time;
}
void
diff --git a/src/plugins/properties/bacon-video-widget-properties.h b/src/plugins/properties/bacon-video-widget-properties.h
index 161c943..ce3645a 100644
--- a/src/plugins/properties/bacon-video-widget-properties.h
+++ b/src/plugins/properties/bacon-video-widget-properties.h
@@ -51,8 +51,6 @@ void bacon_video_widget_properties_reset (BaconVideoWidgetProperties *props);
void bacon_video_widget_properties_update (BaconVideoWidgetProperties *props,
GtkWidget *bvw);
void bacon_video_widget_properties_from_time (BaconVideoWidgetProperties *props,
- int time);
-
-char *bacon_video_widget_properties_time_to_string (int time);
+ int _time);
#endif /* BACON_VIDEO_WIDGET_PROPERTIES_H */
diff --git a/src/plugins/publish/totem-publish.c b/src/plugins/publish/totem-publish.c
index 669c918..8399d64 100644
--- a/src/plugins/publish/totem-publish.c
+++ b/src/plugins/publish/totem-publish.c
@@ -201,14 +201,14 @@ totem_publish_plugin_playlist_cb (EpcPublisher *publisher,
g_slist_length (self->playlist));
for (iter = self->playlist, i = 1; iter; iter = iter->next, ++i) {
- gchar *key = iter->data;
+ gchar *file_key = iter->data;
gchar *uri;
- uri = epc_publisher_get_uri (publisher, key, NULL);
+ uri = epc_publisher_get_uri (publisher, file_key, NULL);
g_string_append_printf (buffer,
"File%d=%s\nTitle%d=%s\n",
- i, uri, i, key + 6);
+ i, uri, i, file_key + 6);
g_free (uri);
}
diff --git a/src/plugins/screenshot/totem-gallery.c b/src/plugins/screenshot/totem-gallery.c
index fb6d040..53e2c93 100644
--- a/src/plugins/screenshot/totem-gallery.c
+++ b/src/plugins/screenshot/totem-gallery.c
@@ -148,10 +148,10 @@ dialog_response_callback (GtkDialog *dialog, gint response_id, TotemGallery *sel
totem_screenshot_plugin_update_file_chooser (filename);
/* Build the command and arguments to pass it */
- argv[0] = "totem-video-thumbnailer";
- argv[1] = "-j"; /* JPEG mode */
- argv[2] = "-l"; /* don't limit resources */
- argv[3] = "-p"; /* print progress */
+ argv[0] = (gchar*) "totem-video-thumbnailer"; /* a little hacky, but only the allocated stuff is freed below */
+ argv[1] = (gchar*) "-j"; /* JPEG mode */
+ argv[2] = (gchar*) "-l"; /* don't limit resources */
+ argv[3] = (gchar*) "-p"; /* print progress */
argv[4] = g_strdup_printf ("--gallery=%u", screenshot_count); /* number of screenshots to output */
argv[5] = g_strdup_printf ("--size=%u", gtk_spin_button_get_value_as_int (self->priv->screenshot_width)); /* screenshot width */
argv[6] = video_mrl; /* video to thumbnail */
diff --git a/src/plugins/screenshot/totem-screenshot.c b/src/plugins/screenshot/totem-screenshot.c
index 5ec1777..0e25111 100644
--- a/src/plugins/screenshot/totem-screenshot.c
+++ b/src/plugins/screenshot/totem-screenshot.c
@@ -91,7 +91,7 @@ drag_data_get (GtkWidget *widget,
GdkDragContext *context,
GtkSelectionData *selection_data,
guint info,
- guint time,
+ guint _time,
TotemScreenshot *screenshot)
{
char *string;
diff --git a/src/plugins/skipto/totem-skipto-plugin.c b/src/plugins/skipto/totem-skipto-plugin.c
index 0fa7c4c..c16e5eb 100644
--- a/src/plugins/skipto/totem-skipto-plugin.c
+++ b/src/plugins/skipto/totem-skipto-plugin.c
@@ -105,18 +105,18 @@ static void
totem_skipto_update_from_state (TotemObject *totem,
TotemSkiptoPlugin *plugin)
{
- gint64 time;
+ gint64 _time;
gboolean seekable;
GtkAction *action;
TotemSkiptoPluginPrivate *priv = plugin->priv;
g_object_get (G_OBJECT (totem),
- "stream-length", &time,
+ "stream-length", &_time,
"seekable", &seekable,
NULL);
if (priv->st != NULL) {
- totem_skipto_update_range (priv->st, time);
+ totem_skipto_update_range (priv->st, _time);
totem_skipto_set_seekable (priv->st, seekable);
}
diff --git a/src/plugins/skipto/totem-skipto.c b/src/plugins/skipto/totem-skipto.c
index f34f493..acc1b16 100644
--- a/src/plugins/skipto/totem-skipto.c
+++ b/src/plugins/skipto/totem-skipto.c
@@ -100,28 +100,28 @@ totem_skipto_dispose (GObject *object)
}
void
-totem_skipto_update_range (TotemSkipto *skipto, gint64 time)
+totem_skipto_update_range (TotemSkipto *skipto, gint64 _time)
{
g_return_if_fail (TOTEM_IS_SKIPTO (skipto));
- if (time == skipto->priv->time)
+ if (_time == skipto->priv->time)
return;
gtk_spin_button_set_range (GTK_SPIN_BUTTON (skipto->priv->time_entry),
- 0, (gdouble) time / 1000);
- skipto->priv->time = time;
+ 0, (gdouble) _time / 1000);
+ skipto->priv->time = _time;
}
gint64
totem_skipto_get_range (TotemSkipto *skipto)
{
- gint64 time;
+ gint64 _time;
g_return_val_if_fail (TOTEM_IS_SKIPTO (skipto), 0);
- time = gtk_spin_button_get_value (GTK_SPIN_BUTTON (skipto->priv->time_entry)) * 1000;
+ _time = gtk_spin_button_get_value (GTK_SPIN_BUTTON (skipto->priv->time_entry)) * 1000;
- return time;
+ return _time;
}
void
@@ -134,12 +134,12 @@ totem_skipto_set_seekable (TotemSkipto *skipto, gboolean seekable)
}
void
-totem_skipto_set_current (TotemSkipto *skipto, gint64 time)
+totem_skipto_set_current (TotemSkipto *skipto, gint64 _time)
{
g_return_if_fail (TOTEM_IS_SKIPTO (skipto));
gtk_spin_button_set_value (GTK_SPIN_BUTTON (skipto->priv->time_entry),
- (gdouble) (time / 1000));
+ (gdouble) (_time / 1000));
}
void
diff --git a/src/plugins/skipto/totem-skipto.h b/src/plugins/skipto/totem-skipto.h
index f916ebe..0e12d50 100644
--- a/src/plugins/skipto/totem-skipto.h
+++ b/src/plugins/skipto/totem-skipto.h
@@ -61,9 +61,9 @@ struct TotemSkiptoClass {
GType totem_skipto_get_type (void);
GtkWidget *totem_skipto_new (TotemSkiptoPlugin *plugin);
gint64 totem_skipto_get_range (TotemSkipto *skipto);
-void totem_skipto_update_range (TotemSkipto *skipto, gint64 time);
+void totem_skipto_update_range (TotemSkipto *skipto, gint64 _time);
void totem_skipto_set_seekable (TotemSkipto *skipto, gboolean seekable);
-void totem_skipto_set_current (TotemSkipto *skipto, gint64 time);
+void totem_skipto_set_current (TotemSkipto *skipto, gint64 _time);
G_END_DECLS
diff --git a/src/plugins/totem-plugins-engine.c b/src/plugins/totem-plugins-engine.c
index f08d652..09f9964 100644
--- a/src/plugins/totem-plugins-engine.c
+++ b/src/plugins/totem-plugins-engine.c
@@ -528,6 +528,8 @@ load_plugin_module (TotemPluginInfo *info)
g_warning ("Cannot load plugin %s, Python plugin support is disabled", info->location);
#endif
break;
+ default:
+ g_assert_not_reached ();
}
if (g_type_module_use (info->module) == FALSE) {
@@ -548,6 +550,8 @@ load_plugin_module (TotemPluginInfo *info)
info->plugin = TOTEM_PLUGIN (totem_python_module_new_object (TOTEM_PYTHON_MODULE (info->module)));
#endif
break;
+ default:
+ g_assert_not_reached ();
}
return TRUE;
@@ -692,7 +696,7 @@ totem_plugins_engine_configure_plugin (TotemPluginInfo *info,
}
static void
-totem_plugins_engine_plugin_active_cb (GConfClient *client,
+totem_plugins_engine_plugin_active_cb (GConfClient *gconf_client,
guint cnxn_id,
GConfEntry *entry,
TotemPluginInfo *info)
@@ -705,7 +709,7 @@ totem_plugins_engine_plugin_active_cb (GConfClient *client,
}
static void
-totem_plugins_engine_plugin_visible_cb (GConfClient *client,
+totem_plugins_engine_plugin_visible_cb (GConfClient *gconf_client,
guint cnxn_id,
GConfEntry *entry,
TotemPluginInfo *info)
diff --git a/src/plugins/youtube/totem-youtube.c b/src/plugins/youtube/totem-youtube.c
index f014af7..1a85da4 100644
--- a/src/plugins/youtube/totem-youtube.c
+++ b/src/plugins/youtube/totem-youtube.c
@@ -994,7 +994,6 @@ starting_video_cb (TotemVideoList *video_list, GtkTreePath *path, TotemYouTubePl
if (gtk_tree_model_get_iter (GTK_TREE_MODEL (self->list_store[self->current_tree_view]), &iter, path) == FALSE)
return FALSE;
gtk_tree_model_get (GTK_TREE_MODEL (self->list_store[self->current_tree_view]), &iter, 3, &video_entry, -1);
-g_message ("starting_video_cb: model: %lu, path: %lu, current tv: %u", self->list_store[self->current_tree_view], path, self->current_tree_view);
if (self->playing_video != NULL)
g_object_unref (self->playing_video);
diff --git a/src/totem-menu.c b/src/totem-menu.c
index f9b7794..1b001cf 100644
--- a/src/totem-menu.c
+++ b/src/totem-menu.c
@@ -33,6 +33,7 @@
#include "totem-sidebar.h"
#include "totem-plugin-manager.h"
#include "bacon-video-widget.h"
+#include "totem-uri.h"
#include "debug.h"
@@ -279,7 +280,7 @@ languages_changed_callback (GtkRadioAction *action, GtkRadioAction *current,
static GtkAction *
add_lang_action (Totem *totem, GtkActionGroup *action_group, guint ui_id,
const char **paths, const char *prefix, const char *lang,
- int lang_id, int index, GSList **group)
+ int lang_id, int lang_index, GSList **group)
{
const char *full_lang;
char *label;
@@ -289,12 +290,12 @@ add_lang_action (Totem *totem, GtkActionGroup *action_group, guint ui_id,
full_lang = totem_lang_get_full (lang);
- if (index > 1) {
+ if (lang_index > 1) {
char *num_lang;
num_lang = g_strdup_printf ("%s #%u",
full_lang ? full_lang : lang,
- index);
+ lang_index);
label = escape_label_for_menu (num_lang);
g_free (num_lang);
} else {
@@ -709,13 +710,13 @@ totem_action_add_recent (Totem *totem, const char *uri)
data.display_name = NULL;
/* Bogus mime-type, we just want it added */
data.mime_type = g_strdup ("video/x-totem-stream");
- groups[0] = "TotemStreams";
+ groups[0] = (gchar*) "TotemStreams";
g_message ("no file info");
} else {
data.mime_type = g_strdup (g_file_info_get_content_type (file_info));
data.display_name = g_strdup (g_file_info_get_display_name (file_info));
g_object_unref (file_info);
- groups[0] = "Totem";
+ groups[0] = (gchar*) "Totem";
}
g_object_unref (file);
diff --git a/src/totem-object.c b/src/totem-object.c
index 3f19541..dda6db7 100644
--- a/src/totem-object.c
+++ b/src/totem-object.c
@@ -98,9 +98,10 @@
#define BVW_VBOX_BORDER_WIDTH 1
+/* casts are to shut gcc up */
static const GtkTargetEntry target_table[] = {
- { "text/uri-list", 0, 0 },
- { "_NETSCAPE_URL", 0, 1 }
+ { (gchar*) "text/uri-list", 0, 0 },
+ { (gchar*) "_NETSCAPE_URL", 0, 1 }
};
static gboolean totem_action_open_files_list (Totem *totem, GSList *list);
@@ -535,9 +536,9 @@ totem_get_playlist_pos (Totem *totem)
* Return value: the entry title at @index, or %NULL; free with g_free()
**/
char *
-totem_get_title_at_playlist_pos (Totem *totem, guint index)
+totem_get_title_at_playlist_pos (Totem *totem, guint playlist_index)
{
- return totem_playlist_get_title (totem->playlist, index);
+ return totem_playlist_get_title (totem->playlist, playlist_index);
}
/**
@@ -1164,13 +1165,15 @@ totem_dvb_setup_result (int result, const char *device, gpointer user_data)
static gboolean
totem_action_load_media (Totem *totem, TotemDiscMediaType type, const char *device)
{
- char **mrls, *msg;
+ char **mrls;
GError *error = NULL;
const char *link, *link_text, *secondary;
gboolean retval;
mrls = bacon_video_widget_get_mrls (totem->bvw, type, device, &error);
if (mrls == NULL) {
+ char *msg;
+
/* No errors? Weird */
if (error == NULL) {
msg = g_strdup_printf (_("Totem could not play this media (%s) although a plugin is present to handle it."), _(totem_cd_get_human_readable_name (type)));
@@ -1178,6 +1181,7 @@ totem_action_load_media (Totem *totem, TotemDiscMediaType type, const char *devi
g_free (msg);
return FALSE;
}
+
/* No plugin for the media type */
if (g_error_matches (error, BVW_ERROR, BVW_ERROR_NO_PLUGIN_FOR_FILE) != FALSE) {
link = "http://www.gnome.org/projects/totem/#codecs";;
@@ -1190,8 +1194,8 @@ totem_action_load_media (Totem *totem, TotemDiscMediaType type, const char *devi
/* Device doesn't exist */
} else if (g_error_matches (error, BVW_ERROR, BVW_ERROR_INVALID_DEVICE) != FALSE) {
g_assert (type == MEDIA_TYPE_DVB);
- msg = N_("Totem cannot play TV, because no TV adapters are present or they are not supported.");
- totem_action_error (_(msg), _("Please insert a supported TV adapter."), totem);
+ totem_action_error (_("Totem cannot play TV, because no TV adapters are present or they are not supported."),
+ _("Please insert a supported TV adapter."), totem);
return FALSE;
/* No channels.conf file */
} else if (g_error_matches (error, BVW_ERROR, BVW_ERROR_FILE_NOT_FOUND) != FALSE) {
@@ -1219,6 +1223,7 @@ totem_action_load_media (Totem *totem, TotemDiscMediaType type, const char *devi
} else {
g_assert_not_reached ();
}
+
totem_interface_error_with_link (msg, secondary, link, link_text, GTK_WINDOW (totem->win), totem);
g_free (msg);
return FALSE;
@@ -1408,9 +1413,8 @@ window_state_event_cb (GtkWidget *window, GdkEventWindowState *event,
return FALSE;
if (event->new_window_state & GDK_WINDOW_STATE_FULLSCREEN) {
- if (totem->controls_visibility != TOTEM_CONTROLS_UNDEFINED) {
+ if (totem->controls_visibility != TOTEM_CONTROLS_UNDEFINED)
totem_action_save_size (totem);
- }
totem_fullscreen_set_fullscreen (totem->fs, TRUE);
totem->controls_visibility = TOTEM_CONTROLS_FULLSCREEN;
@@ -1424,11 +1428,10 @@ window_state_event_cb (GtkWidget *window, GdkEventWindowState *event,
action = gtk_action_group_get_action (totem->main_action_group,
"show-controls");
- if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action))) {
+ if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)))
totem->controls_visibility = TOTEM_CONTROLS_VISIBLE;
- } else {
+ else
totem->controls_visibility = TOTEM_CONTROLS_HIDDEN;
- }
show_controls (totem, TRUE);
totem_action_set_sensitivity ("fullscreen", TRUE);
@@ -1758,8 +1761,9 @@ totem_action_set_mrl_with_warning (Totem *totem,
totem->mrl = NULL;
bacon_video_widget_set_logo_mode (totem->bvw, TRUE);
} else {
+ /* cast is to shut gcc up */
const GtkTargetEntry source_table[] = {
- { "text/uri-list", 0, 0 }
+ { (gchar*) "text/uri-list", 0, 0 }
};
totem_file_opened (totem, totem->mrl);
@@ -1799,11 +1803,11 @@ totem_action_set_mrl (Totem *totem, const char *mrl, const char *subtitle)
static gboolean
totem_time_within_seconds (Totem *totem)
{
- gint64 time;
+ gint64 _time;
- time = bacon_video_widget_get_current_time (totem->bvw);
+ _time = bacon_video_widget_get_current_time (totem->bvw);
- return (time < REWIND_OR_PREVIOUS);
+ return (_time < REWIND_OR_PREVIOUS);
}
static void
@@ -1868,7 +1872,7 @@ totem_action_next (Totem *totem)
}
static void
-totem_seek_time_rel (Totem *totem, gint64 time, gboolean relative)
+totem_seek_time_rel (Totem *totem, gint64 _time, gboolean relative)
{
GError *err = NULL;
gint64 sec;
@@ -1884,9 +1888,9 @@ totem_seek_time_rel (Totem *totem, gint64 time, gboolean relative)
if (relative != FALSE) {
gint64 oldmsec;
oldmsec = bacon_video_widget_get_current_time (totem->bvw);
- sec = MAX (0, oldmsec + time);
+ sec = MAX (0, oldmsec + _time);
} else {
- sec = time;
+ sec = _time;
}
bacon_video_widget_seek_time (totem->bvw, sec, &err);
@@ -2205,31 +2209,31 @@ drop_video_cb (GtkWidget *widget,
gint y,
GtkSelectionData *data,
guint info,
- guint time,
+ guint _time,
Totem *totem)
{
gboolean empty_pl;
- /* Drop of video on itself */
- if (context->source_window == totem->video_drag_source_window &&
- context->action == GDK_ACTION_MOVE) {
- gtk_drag_finish (context, FALSE, FALSE, time);
- return;
- }
-
- if (context->action == GDK_ACTION_ASK) {
+ if (context->suggested_action == GDK_ACTION_ASK) {
context->action = totem_drag_ask (totem_get_playlist_length (totem) > 0);
}
/* User selected cancel */
if (context->action == GDK_ACTION_DEFAULT) {
- gtk_drag_finish (context, FALSE, FALSE, time);
+ gtk_drag_finish (context, FALSE, FALSE, _time);
+ return;
+ }
+
+ /* Drop of video on itself */
+ if (context->source_window == totem->video_drag_source_window &&
+ context->action == GDK_ACTION_MOVE) {
+ gtk_drag_finish (context, FALSE, FALSE, _time);
return;
}
empty_pl = (context->action == GDK_ACTION_MOVE);
totem_action_drop_files (totem, data, info, empty_pl);
- gtk_drag_finish (context, TRUE, FALSE, time);
+ gtk_drag_finish (context, TRUE, FALSE, _time);
return;
}
@@ -2238,18 +2242,18 @@ drag_motion_video_cb (GtkWidget *widget,
GdkDragContext *context,
gint x,
gint y,
- guint time,
+ guint _time,
Totem *totem)
{
GdkModifierType mask;
gdk_window_get_pointer (widget->window, NULL, NULL, &mask);
if (mask & GDK_CONTROL_MASK) {
- gdk_drag_status (context, GDK_ACTION_COPY, time);
+ gdk_drag_status (context, GDK_ACTION_COPY, _time);
} else if (mask & GDK_MOD1_MASK || context->suggested_action == GDK_ACTION_ASK) {
- gdk_drag_status (context, GDK_ACTION_ASK, time);
+ gdk_drag_status (context, GDK_ACTION_ASK, _time);
} else {
- gdk_drag_status (context, GDK_ACTION_MOVE, time);
+ gdk_drag_status (context, GDK_ACTION_MOVE, _time);
}
}
@@ -2260,23 +2264,23 @@ drop_playlist_cb (GtkWidget *widget,
gint y,
GtkSelectionData *data,
guint info,
- guint time,
+ guint _time,
Totem *totem)
{
gboolean empty_pl;
- if (context->action == GDK_ACTION_ASK)
+ if (context->suggested_action == GDK_ACTION_ASK)
context->action = totem_drag_ask (totem_get_playlist_length (totem) > 0);
if (context->action == GDK_ACTION_DEFAULT) {
- gtk_drag_finish (context, FALSE, FALSE, time);
+ gtk_drag_finish (context, FALSE, FALSE, _time);
return;
}
empty_pl = (context->action == GDK_ACTION_MOVE);
totem_action_drop_files (totem, data, info, empty_pl);
- gtk_drag_finish (context, TRUE, FALSE, time);
+ gtk_drag_finish (context, TRUE, FALSE, _time);
}
static void
@@ -2284,7 +2288,7 @@ drag_motion_playlist_cb (GtkWidget *widget,
GdkDragContext *context,
gint x,
gint y,
- guint time,
+ guint _time,
Totem *totem)
{
GdkModifierType mask;
@@ -2292,7 +2296,7 @@ drag_motion_playlist_cb (GtkWidget *widget,
gdk_window_get_pointer (widget->window, NULL, NULL, &mask);
if (mask & GDK_MOD1_MASK || context->suggested_action == GDK_ACTION_ASK) {
- gdk_drag_status (context, GDK_ACTION_ASK, time);
+ gdk_drag_status (context, GDK_ACTION_ASK, _time);
}
}
static void
@@ -2300,7 +2304,7 @@ drag_video_cb (GtkWidget *widget,
GdkDragContext *context,
GtkSelectionData *selection_data,
guint info,
- guint32 time,
+ guint32 _time,
gpointer callback_data)
{
Totem *totem = (Totem *) callback_data;
@@ -2594,18 +2598,18 @@ void
seek_slider_changed_cb (GtkAdjustment *adj, Totem *totem)
{
double pos;
- gint time;
+ gint _time;
if (totem->seek_lock == FALSE)
return;
pos = gtk_adjustment_get_value (adj) / 65535;
- time = bacon_video_widget_get_stream_length (totem->bvw);
+ _time = bacon_video_widget_get_stream_length (totem->bvw);
totem_statusbar_set_time_and_length (TOTEM_STATUSBAR (totem->statusbar),
- (int) (pos * time / 1000), time / 1000);
+ (int) (pos * _time / 1000), _time / 1000);
totem_time_label_set_time
(TOTEM_TIME_LABEL (totem->fs->time_label),
- (int) (pos * time), time);
+ (int) (pos * _time), _time);
if (bacon_video_widget_can_direct_seek (totem->bvw) != FALSE)
totem_action_seek (totem, pos);
@@ -2873,11 +2877,11 @@ totem_action_next_angle (Totem *totem)
* has the effect of restarting the current playlist entry.
**/
void
-totem_action_set_playlist_index (Totem *totem, guint index)
+totem_action_set_playlist_index (Totem *totem, guint playlist_index)
{
char *mrl, *subtitle;
- totem_playlist_set_current (totem->playlist, index);
+ totem_playlist_set_current (totem->playlist, playlist_index);
mrl = totem_playlist_get_current_mrl (totem->playlist, &subtitle);
totem_action_set_mrl_and_play (totem, mrl, subtitle);
g_free (mrl);
@@ -3050,6 +3054,7 @@ totem_action_remote (Totem *totem, TotemRemoteCommand cmd, const char *url)
case TOTEM_REMOTE_COMMAND_TOGGLE_ASPECT:
totem_action_toggle_aspect_ratio (totem);
break;
+ case TOTEM_REMOTE_COMMAND_UNKNOWN:
default:
handled = FALSE;
break;
@@ -3365,6 +3370,8 @@ totem_action_handle_key_release (Totem *totem, GdkEventKey *event)
totem_statusbar_set_seeking (TOTEM_STATUSBAR (totem->statusbar), FALSE);
totem_time_label_set_seeking (TOTEM_TIME_LABEL (totem->fs->time_label), FALSE);
break;
+ default:
+ retval = FALSE;
}
return retval;
@@ -3664,7 +3671,7 @@ window_key_press_event_cb (GtkWidget *win, GdkEventKey *event, Totem *totem)
if (event->state != 0
&& (event->state & GDK_CONTROL_MASK))
{
- switch (event->keyval)
+ switch (event->keyval) {
case GDK_E:
case GDK_e:
case GDK_O:
@@ -3682,22 +3689,25 @@ window_key_press_event_cb (GtkWidget *win, GdkEventKey *event, Totem *totem)
case GDK_minus:
case GDK_KP_Subtract:
case GDK_0:
- if (event->type == GDK_KEY_PRESS) {
+ if (event->type == GDK_KEY_PRESS)
return totem_action_handle_key_press (totem, event);
- } else {
+ else
return totem_action_handle_key_release (totem, event);
- }
+ default:
+ break;
+ }
}
- if (event->state != 0
- && (event->state & GDK_SUPER_MASK)) {
- switch (event->keyval)
+ if (event->state != 0 && (event->state & GDK_SUPER_MASK)) {
+ switch (event->keyval) {
case GDK_Escape:
- if (event->type == GDK_KEY_PRESS) {
+ if (event->type == GDK_KEY_PRESS)
return totem_action_handle_key_press (totem, event);
- } else {
+ else
return totem_action_handle_key_release (totem, event);
- }
+ default:
+ break;
+ }
}
diff --git a/src/totem-options.c b/src/totem-options.c
index 57e3d8b..b5a5f00 100644
--- a/src/totem-options.c
+++ b/src/totem-options.c
@@ -44,7 +44,7 @@ option_version_cb (const gchar *option_name,
exit (0);
}
-const GOptionEntry options[] = {
+const GOptionEntry all_options[] = {
{"debug", '\0', 0, G_OPTION_ARG_NONE, &optionstate.debug, N_("Enable debug"), NULL},
{"play-pause", '\0', 0, G_OPTION_ARG_NONE, &optionstate.playpause, N_("Play/Pause"), NULL},
{"play", '\0', 0, G_OPTION_ARG_NONE, &optionstate.play, N_("Play"), NULL},
@@ -70,7 +70,7 @@ const GOptionEntry options[] = {
};
void
-totem_options_process_late (Totem *totem, const TotemCmdLineOptions* options)
+totem_options_process_late (Totem *totem, const TotemCmdLineOptions *options)
{
if (options->togglecontrols)
totem_action_toggle_controls (totem);
diff --git a/src/totem-options.h b/src/totem-options.h
index 33830da..185eec9 100644
--- a/src/totem-options.h
+++ b/src/totem-options.h
@@ -31,8 +31,7 @@
G_BEGIN_DECLS
/* Stores the state of the command line options */
-typedef struct
-{
+typedef struct {
gboolean debug;
gboolean playpause;
gboolean play;
@@ -55,7 +54,7 @@ typedef struct
gchar **filenames;
} TotemCmdLineOptions;
-extern const GOptionEntry options[];
+extern const GOptionEntry all_options[];
extern TotemCmdLineOptions optionstate;
void totem_options_register_remote_commands (Totem *totem);
diff --git a/src/totem-playlist.c b/src/totem-playlist.c
index 12d2719..29c5979 100644
--- a/src/totem-playlist.c
+++ b/src/totem-playlist.c
@@ -155,9 +155,10 @@ static PlaylistSaveType save_types [] = {
static int totem_playlist_table_signals[LAST_SIGNAL];
+/* casts are to shut gcc up */
static const GtkTargetEntry target_table[] = {
- { "text/uri-list", 0, 0 },
- { "_NETSCAPE_URL", 0, 1 }
+ { (gchar*) "text/uri-list", 0, 0 },
+ { (gchar*) "_NETSCAPE_URL", 0, 1 }
};
static void init_treeview (GtkWidget *treeview, TotemPlaylist *playlist);
@@ -462,7 +463,7 @@ drop_cb (GtkWidget *widget,
gint y,
GtkSelectionData *data,
guint info,
- guint time,
+ guint _time,
TotemPlaylist *playlist)
{
char **list;
@@ -472,7 +473,7 @@ drop_cb (GtkWidget *widget,
if (context->suggested_action == GDK_ACTION_ASK) {
context->action = totem_drag_ask (PL_LEN != 0);
if (context->action == GDK_ACTION_DEFAULT) {
- gtk_drag_finish (context, FALSE, FALSE, time);
+ gtk_drag_finish (context, FALSE, FALSE, _time);
return;
}
}
@@ -491,7 +492,7 @@ drop_cb (GtkWidget *widget,
}
if (file_list == NULL) {
- gtk_drag_finish (context, FALSE, FALSE, time);
+ gtk_drag_finish (context, FALSE, FALSE, _time);
return;
}
@@ -536,7 +537,7 @@ drop_cb (GtkWidget *widget,
g_strfreev (list);
g_list_free (file_list);
- gtk_drag_finish (context, TRUE, FALSE, time);
+ gtk_drag_finish (context, TRUE, FALSE, _time);
gtk_tree_path_free (playlist->priv->tree_path);
playlist->priv->tree_path = NULL;
@@ -587,7 +588,7 @@ static gboolean
playlist_show_popup_menu (TotemPlaylist *playlist, GdkEventButton *event)
{
guint button = 0;
- guint32 time;
+ guint32 _time;
GtkTreePath *path;
gint count;
GtkWidget *menu;
@@ -596,7 +597,7 @@ playlist_show_popup_menu (TotemPlaylist *playlist, GdkEventButton *event)
if (event != NULL) {
button = event->button;
- time = event->time;
+ _time = event->time;
if (gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (playlist->priv->treeview),
event->x, event->y, &path, NULL, NULL, NULL)) {
@@ -609,7 +610,7 @@ playlist_show_popup_menu (TotemPlaylist *playlist, GdkEventButton *event)
gtk_tree_selection_unselect_all (playlist->priv->selection);
}
} else {
- time = gtk_get_current_event_time ();
+ _time = gtk_get_current_event_time ();
}
count = gtk_tree_selection_count_selected_rows (playlist->priv->selection);
@@ -628,7 +629,7 @@ playlist_show_popup_menu (TotemPlaylist *playlist, GdkEventButton *event)
gtk_menu_shell_select_first (GTK_MENU_SHELL (menu), FALSE);
gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL,
- button, time);
+ button, _time);
return TRUE;
}
@@ -665,19 +666,19 @@ totem_playlist_set_reorderable (TotemPlaylist *playlist, gboolean set)
for (i = 0; i < num_items; i++)
{
GtkTreeIter iter;
- char *index;
+ char *playlist_index;
GtkTreePath *path;
TotemPlaylistStatus playing;
- index = g_strdup_printf ("%d", i);
+ playlist_index = g_strdup_printf ("%d", i);
if (gtk_tree_model_get_iter_from_string
(playlist->priv->model,
- &iter, index) == FALSE)
+ &iter, playlist_index) == FALSE)
{
- g_free (index);
+ g_free (playlist_index);
continue;
}
- g_free (index);
+ g_free (playlist_index);
gtk_tree_model_get (playlist->priv->model, &iter, PLAYING_COL, &playing, -1);
if (playing == TOTEM_PLAYLIST_STATUS_NONE)
@@ -1849,14 +1850,14 @@ totem_playlist_clear_with_compare (TotemPlaylist *playlist,
for (i = 0; i < num_items; i++) {
GtkTreeIter iter;
- char *index;
+ char *playlist_index;
- index = g_strdup_printf ("%d", i);
- if (gtk_tree_model_get_iter_from_string (playlist->priv->model, &iter, index) == FALSE) {
- g_free (index);
+ playlist_index = g_strdup_printf ("%d", i);
+ if (gtk_tree_model_get_iter_from_string (playlist->priv->model, &iter, playlist_index) == FALSE) {
+ g_free (playlist_index);
continue;
}
- g_free (index);
+ g_free (playlist_index);
if ((* func) (playlist, &iter, data) != FALSE) {
GtkTreePath *path;
@@ -2047,7 +2048,7 @@ totem_playlist_get_current_title (TotemPlaylist *playlist, gboolean *custom)
}
char *
-totem_playlist_get_title (TotemPlaylist *playlist, guint index)
+totem_playlist_get_title (TotemPlaylist *playlist, guint title_index)
{
GtkTreeIter iter;
GtkTreePath *path;
@@ -2055,7 +2056,7 @@ totem_playlist_get_title (TotemPlaylist *playlist, guint index)
g_return_val_if_fail (TOTEM_IS_PLAYLIST (playlist), NULL);
- path = gtk_tree_path_new_from_indices (index, -1);
+ path = gtk_tree_path_new_from_indices (title_index, -1);
gtk_tree_model_get_iter (playlist->priv->model,
&iter, path);
@@ -2388,7 +2389,7 @@ int
totem_playlist_get_current (TotemPlaylist *playlist)
{
char *path;
- double index;
+ double current_index;
g_return_val_if_fail (TOTEM_IS_PLAYLIST (playlist), -1);
@@ -2398,10 +2399,10 @@ totem_playlist_get_current (TotemPlaylist *playlist)
if (path == NULL)
return -1;
- index = g_ascii_strtod (path, NULL);
+ current_index = g_ascii_strtod (path, NULL);
g_free (path);
- return index;
+ return current_index;
}
int
@@ -2418,17 +2419,17 @@ totem_playlist_get_last (TotemPlaylist *playlist)
}
void
-totem_playlist_set_current (TotemPlaylist *playlist, guint index)
+totem_playlist_set_current (TotemPlaylist *playlist, guint current_index)
{
g_return_if_fail (TOTEM_IS_PLAYLIST (playlist));
- if (index >= (guint) PL_LEN)
+ if (current_index >= (guint) PL_LEN)
return;
totem_playlist_unset_playing (playlist);
//FIXME problems when shuffled?
gtk_tree_path_free (playlist->priv->current);
- playlist->priv->current = gtk_tree_path_new_from_indices (index, -1);
+ playlist->priv->current = gtk_tree_path_new_from_indices (current_index, -1);
}
static void
diff --git a/src/totem-playlist.h b/src/totem-playlist.h
index 669dfd7..0ec018b 100644
--- a/src/totem-playlist.h
+++ b/src/totem-playlist.h
@@ -111,7 +111,7 @@ char *totem_playlist_get_current_mrl (TotemPlaylist *playlist,
char *totem_playlist_get_current_title (TotemPlaylist *playlist,
gboolean *custom);
char *totem_playlist_get_title (TotemPlaylist *playlist,
- guint index);
+ guint title_index);
gboolean totem_playlist_set_title (TotemPlaylist *playlist,
const char *title,
@@ -142,7 +142,7 @@ void totem_playlist_set_at_end (TotemPlaylist *playlist);
int totem_playlist_get_current (TotemPlaylist *playlist);
int totem_playlist_get_last (TotemPlaylist *playlist);
-void totem_playlist_set_current (TotemPlaylist *playlist, guint index);
+void totem_playlist_set_current (TotemPlaylist *playlist, guint current_index);
void totem_playlist_foreach (TotemPlaylist *playlist,
TotemPlaylistForeachFunc callback,
diff --git a/src/totem-preferences.c b/src/totem-preferences.c
index b803a77..4ef5446 100644
--- a/src/totem-preferences.c
+++ b/src/totem-preferences.c
@@ -617,12 +617,12 @@ totem_setup_preferences (Totem *totem)
/* Brightness and all */
hidden = 0;
for (i = 0; i < G_N_ELEMENTS (props); i++) {
- int value;
+ int prop_value;
item = gtk_builder_get_object (totem->xml, props[i].name);
- value = bacon_video_widget_get_video_property (totem->bvw,
+ prop_value = bacon_video_widget_get_video_property (totem->bvw,
props[i].prop);
- if (value >= 0)
- gtk_range_set_value (GTK_RANGE (item), (gdouble) value);
+ if (prop_value >= 0)
+ gtk_range_set_value (GTK_RANGE (item), (gdouble) prop_value);
else {
gtk_range_set_value (GTK_RANGE (item), (gdouble) 65535/2);
gtk_widget_hide (GTK_WIDGET (item));
diff --git a/src/totem-private.h b/src/totem-private.h
index f9eeea1..a18e058 100644
--- a/src/totem-private.h
+++ b/src/totem-private.h
@@ -51,9 +51,9 @@
#define totem_action_set_sensitivity(name, state) \
{ \
- GtkAction *action; \
- action = gtk_action_group_get_action (totem->main_action_group, name); \
- gtk_action_set_sensitive (action, state); \
+ GtkAction *__action; \
+ __action = gtk_action_group_get_action (totem->main_action_group, name);\
+ gtk_action_set_sensitive (__action, state); \
}
typedef enum {
diff --git a/src/totem-session.c b/src/totem-session.c
index f014c05..1962246 100644
--- a/src/totem-session.c
+++ b/src/totem-session.c
@@ -57,7 +57,7 @@ totem_save_state_cb (EggSMClient *client,
GKeyFile *key_file,
Totem *totem)
{
- char *argv[] = { NULL, NULL, NULL, NULL, NULL, NULL, NULL };
+ const char *argv[] = { NULL, NULL, NULL, NULL, NULL, NULL, NULL };
int i = 0;
char *path_id, *current, *seek, *uri;
int current_index;
@@ -81,7 +81,7 @@ totem_save_state_cb (EggSMClient *client,
current = g_strdup_printf ("%d", current_index);
seek = g_strdup_printf ("%"G_GINT64_FORMAT,
bacon_video_widget_get_current_time (totem->bvw));
- argv[i++] = (char *) totem->argv0;
+ argv[i++] = totem->argv0;
argv[i++] = "--playlist-idx";
argv[i++] = current;
argv[i++] = "--seek";
diff --git a/src/totem-statusbar.c b/src/totem-statusbar.c
index cfe8387..724833f 100644
--- a/src/totem-statusbar.c
+++ b/src/totem-statusbar.c
@@ -41,8 +41,7 @@
static void totem_statusbar_dispose (GObject *object);
static void totem_statusbar_sync_description (TotemStatusbar *statusbar);
-G_MODULE_EXPORT GType totem_statusbar_get_type(void);
-
+G_MODULE_EXPORT GType totem_statusbar_get_type (void);
G_DEFINE_TYPE(TotemStatusbar, totem_statusbar, GTK_TYPE_STATUSBAR)
static void
@@ -109,26 +108,26 @@ totem_statusbar_new (void)
static void
totem_statusbar_update_time (TotemStatusbar *statusbar)
{
- char *time, *length, *label;
+ char *time_string, *length, *label;
- time = totem_time_to_string (statusbar->time * 1000);
+ time_string = totem_time_to_string (statusbar->time * 1000);
if (statusbar->length < 0) {
- label = g_strdup_printf (_("%s (Streaming)"), time);
+ label = g_strdup_printf (_("%s (Streaming)"), time_string);
} else {
length = totem_time_to_string
(statusbar->length == -1 ? 0 : statusbar->length * 1000);
if (statusbar->seeking == FALSE)
/* Elapsed / Total Length */
- label = g_strdup_printf (_("%s / %s"), time, length);
+ label = g_strdup_printf (_("%s / %s"), time_string, length);
else
/* Seeking to Time / Total Length */
- label = g_strdup_printf (_("Seek to %s / %s"), time, length);
+ label = g_strdup_printf (_("Seek to %s / %s"), time_string, length);
g_free (length);
}
- g_free (time);
+ g_free (time_string);
gtk_label_set_text (GTK_LABEL (statusbar->time_label), label);
g_free (label);
@@ -150,14 +149,14 @@ totem_statusbar_set_text (TotemStatusbar *statusbar, const char *label)
}
void
-totem_statusbar_set_time (TotemStatusbar *statusbar, gint time)
+totem_statusbar_set_time (TotemStatusbar *statusbar, gint _time)
{
g_return_if_fail (TOTEM_IS_STATUSBAR (statusbar));
- if (statusbar->time == time)
+ if (statusbar->time == _time)
return;
- statusbar->time = time;
+ statusbar->time = _time;
totem_statusbar_update_time (statusbar);
}
@@ -240,13 +239,13 @@ totem_statusbar_pop (TotemStatusbar *statusbar)
void
totem_statusbar_set_time_and_length (TotemStatusbar *statusbar,
- gint time, gint length)
+ gint _time, gint length)
{
g_return_if_fail (TOTEM_IS_STATUSBAR (statusbar));
- if (time != statusbar->time ||
+ if (_time != statusbar->time ||
length != statusbar->length) {
- statusbar->time = time;
+ statusbar->time = _time;
statusbar->length = length;
totem_statusbar_update_time (statusbar);
diff --git a/src/totem-subtitle-encoding.c b/src/totem-subtitle-encoding.c
index b5ddd23..ac4b5b4 100644
--- a/src/totem-subtitle-encoding.c
+++ b/src/totem-subtitle-encoding.c
@@ -143,11 +143,10 @@ typedef enum
} SubtitleEncodingIndex;
-typedef struct
-{
+typedef struct {
int index;
const char *charset;
- char *name;
+ const char *name;
} SubtitleEncoding;
@@ -382,16 +381,16 @@ subtitle_encoding_get_index (const char *charset)
}
static const char *
-subtitle_encoding_get_charset (int index)
+subtitle_encoding_get_charset (int charset_index)
{
const SubtitleEncoding *e;
- if (index >= SUBTITLE_ENCODING_LAST)
+ if (charset_index >= SUBTITLE_ENCODING_LAST)
e = &encodings[SUBTITLE_ENCODING_CURRENT_LOCALE];
- else if (index < SUBTITLE_ENCODING_CURRENT_LOCALE)
+ else if (charset_index < SUBTITLE_ENCODING_CURRENT_LOCALE)
e = &encodings[SUBTITLE_ENCODING_CURRENT_LOCALE];
else
- e = &encodings[index];
+ e = &encodings[charset_index];
return e->charset;
}
@@ -434,7 +433,7 @@ static GtkTreeModel *
subtitle_encoding_create_store (void)
{
gchar *label;
- gchar *lastlang = "";
+ const gchar *lastlang = "";
GtkTreeIter iter, iter2;
GtkTreeStore *store;
int i;
@@ -479,15 +478,15 @@ totem_subtitle_encoding_get_selected (GtkComboBox * combo)
{
GtkTreeModel *model;
GtkTreeIter iter;
- gint index = -1;
+ gint charset_index = -1;
model = gtk_combo_box_get_model (combo);
if (gtk_combo_box_get_active_iter (combo, &iter)) {
- gtk_tree_model_get (model, &iter, INDEX_COL, &index, -1);
+ gtk_tree_model_get (model, &iter, INDEX_COL, &charset_index, -1);
}
- if (index == -1)
+ if (charset_index == -1)
return NULL;
- return subtitle_encoding_get_charset (index);
+ return subtitle_encoding_get_charset (charset_index);
}
void
@@ -495,12 +494,12 @@ totem_subtitle_encoding_set (GtkComboBox * combo, const char *encoding)
{
GtkTreeModel *model;
GtkTreeIter iter, iter2;
- gint index, i;
+ gint enc_index, i;
g_return_if_fail (encoding != NULL);
model = gtk_combo_box_get_model (combo);
- index = subtitle_encoding_get_index (encoding);
+ enc_index = subtitle_encoding_get_index (encoding);
gtk_tree_model_get_iter_first (model, &iter);
do {
if (!gtk_tree_model_iter_has_child (model, &iter))
@@ -509,10 +508,10 @@ totem_subtitle_encoding_set (GtkComboBox * combo, const char *encoding)
continue;
do {
gtk_tree_model_get (model, &iter2, INDEX_COL, &i, -1);
- if (i == index)
+ if (i == enc_index)
break;
} while (gtk_tree_model_iter_next (model, &iter2));
- if (i == index)
+ if (i == enc_index)
break;
} while (gtk_tree_model_iter_next (model, &iter));
gtk_combo_box_set_active_iter (combo, &iter2);
diff --git a/src/totem-time-label.c b/src/totem-time-label.c
index 231b86f..8383ffc 100644
--- a/src/totem-time-label.c
+++ b/src/totem-time-label.c
@@ -11,20 +11,19 @@ struct _TotemTimeLabelPrivate {
gboolean seeking;
};
-G_MODULE_EXPORT GType totem_time_label_get_type(void);
-
+G_MODULE_EXPORT GType totem_time_label_get_type (void);
G_DEFINE_TYPE (TotemTimeLabel, totem_time_label, GTK_TYPE_LABEL)
#define TOTEM_TIME_LABEL_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TOTEM_TYPE_TIME_LABEL, TotemTimeLabelPrivate))
static void
totem_time_label_init (TotemTimeLabel *label)
{
- char *time;
+ char *time_string;
label->priv = G_TYPE_INSTANCE_GET_PRIVATE (label, TOTEM_TYPE_TIME_LABEL, TotemTimeLabelPrivate);
- time = totem_time_to_string (0);
- gtk_label_set_text (GTK_LABEL (label), time);
- g_free (time);
+ time_string = totem_time_to_string (0);
+ gtk_label_set_text (GTK_LABEL (label), time_string);
+ g_free (time_string);
label->priv->time = 0;
label->priv->length = -1;
@@ -44,22 +43,22 @@ totem_time_label_class_init (TotemTimeLabelClass *klass)
}
void
-totem_time_label_set_time (TotemTimeLabel *label, gint64 time, gint64 length)
+totem_time_label_set_time (TotemTimeLabel *label, gint64 _time, gint64 length)
{
char *label_str;
g_return_if_fail (TOTEM_IS_TIME_LABEL (label));
- if (time / 1000 == label->priv->time / 1000
+ if (_time / 1000 == label->priv->time / 1000
&& length / 1000 == label->priv->length / 1000)
return;
if (length <= 0) {
- label_str = totem_time_to_string (time);
+ label_str = totem_time_to_string (_time);
} else {
char *time_str, *length_str;
- time_str = totem_time_to_string (time);
+ time_str = totem_time_to_string (_time);
length_str = totem_time_to_string (length);
if (label->priv->seeking == FALSE)
/* Elapsed / Total Length */
@@ -74,7 +73,7 @@ totem_time_label_set_time (TotemTimeLabel *label, gint64 time, gint64 length)
gtk_label_set_text (GTK_LABEL (label), label_str);
g_free (label_str);
- label->priv->time = time;
+ label->priv->time = _time;
label->priv->length = length;
}
diff --git a/src/totem-video-thumbnailer.c b/src/totem-video-thumbnailer.c
index 5445a9c..3850c7a 100644
--- a/src/totem-video-thumbnailer.c
+++ b/src/totem-video-thumbnailer.c
@@ -536,8 +536,8 @@ create_gallery (BaconVideoWidget *bvw, const char *input, const char *output)
PangoLayout *layout;
PangoFontDescription *font_desc;
gint64 stream_length, screenshot_interval, pos;
- guint columns, rows, current_column, current_row, x, y;
- gint screenshot_width, screenshot_height = 0, x_padding = 0, y_padding = 0;
+ guint columns = 3, rows, current_column, current_row, x, y;
+ gint screenshot_width = 0, screenshot_height = 0, x_padding = 0, y_padding = 0;
gfloat scale = 1.0;
gchar *header_text, *duration_text, *filename;
@@ -772,7 +772,8 @@ int main (int argc, char *argv[])
callback_data data;
#ifdef G_OS_UNIX
- nice (20);
+ if (nice (20) != 20)
+ g_warning ("Couldn't change nice value of process.");
#endif
g_thread_init (NULL);
diff --git a/src/totem.c b/src/totem.c
index 0596ff0..3ad51e0 100644
--- a/src/totem.c
+++ b/src/totem.c
@@ -75,7 +75,7 @@ totem_message_received_cb (UniqueApp *app,
g_free (url);
- return UNIQUE_RESPONSE_OK;;
+ return UNIQUE_RESPONSE_OK;
}
static void
@@ -142,7 +142,7 @@ main (int argc, char **argv)
/* Handle command line arguments */
context = g_option_context_new (N_("- Play movies and songs"));
baconoptiongroup = bacon_video_widget_get_option_group();
- g_option_context_add_main_entries (context, options, GETTEXT_PACKAGE);
+ g_option_context_add_main_entries (context, all_options, GETTEXT_PACKAGE);
g_option_context_set_translation_domain(context, GETTEXT_PACKAGE);
g_option_context_add_group (context, baconoptiongroup);
diff --git a/src/totem.h b/src/totem.h
index 89f27fb..e6a84b9 100644
--- a/src/totem.h
+++ b/src/totem.h
@@ -247,7 +247,7 @@ void totem_action_set_playlist_index (Totem *totem,
guint index);
int totem_get_playlist_pos (Totem *totem);
char * totem_get_title_at_playlist_pos (Totem *totem,
- guint index);
+ guint playlist_index);
void totem_add_to_playlist_and_play (Totem *totem,
const char *uri,
const char *display_name,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
