diff options
author | Bastien Nocera <hadess@hadess.net> | 2013-03-19 10:23:09 +0100 |
---|---|---|
committer | Bastien Nocera <hadess@hadess.net> | 2013-03-19 10:23:09 +0100 |
commit | a51bd8ba880421b098d06fb358d4d417d6b68107 (patch) | |
tree | e715a5a22fab80be934584ecc3bcb2aa1da1987c /src | |
parent | af70bec2a71d13abf260123bdb339a926fc12f4a (diff) | |
download | totem-a51bd8ba880421b098d06fb358d4d417d6b68107.tar.gz |
main: Rename totem_is_fullscreen()
To totem_object_is_fullscreen()
Diffstat (limited to 'src')
-rw-r--r-- | src/plugins/im-status/totem-im-status.c | 2 | ||||
-rw-r--r-- | src/totem-menu.c | 2 | ||||
-rw-r--r-- | src/totem-object.c | 16 | ||||
-rw-r--r-- | src/totem.h | 2 |
4 files changed, 11 insertions, 11 deletions
diff --git a/src/plugins/im-status/totem-im-status.c b/src/plugins/im-status/totem-im-status.c index e36ef0b69..16d164ee7 100644 --- a/src/plugins/im-status/totem-im-status.c +++ b/src/plugins/im-status/totem-im-status.c @@ -98,7 +98,7 @@ totem_im_status_update_from_state (TotemObject *totem, return; if (totem_object_is_playing (totem) != FALSE - && totem_is_fullscreen (totem) != FALSE) { + && totem_object_is_fullscreen (totem) != FALSE) { totem_im_status_set_idleness (pi, TRUE); } else { totem_im_status_set_idleness (pi, FALSE); diff --git a/src/totem-menu.c b/src/totem-menu.c index b9135d9eb..3a9479087 100644 --- a/src/totem-menu.c +++ b/src/totem-menu.c @@ -821,7 +821,7 @@ plugins_action_callback (GtkAction *action, Totem *totem) void show_sidebar_action_callback (GtkToggleAction *action, Totem *totem) { - if (totem_is_fullscreen (totem)) + if (totem_object_is_fullscreen (totem)) return; totem_sidebar_toggle (totem, gtk_toggle_action_get_active (action)); diff --git a/src/totem-object.c b/src/totem-object.c index c908feabe..e923f3c00 100644 --- a/src/totem-object.c +++ b/src/totem-object.c @@ -435,7 +435,7 @@ totem_object_get_property (GObject *object, switch (property_id) { case PROP_FULLSCREEN: - g_value_set_boolean (value, totem_is_fullscreen (totem)); + g_value_set_boolean (value, totem_object_is_fullscreen (totem)); break; case PROP_PLAYING: g_value_set_boolean (value, totem_object_is_playing (totem)); @@ -978,7 +978,7 @@ totem_action_save_size (TotemObject *totem) if (totem->bvw == NULL) return; - if (totem_is_fullscreen (totem) != FALSE) + if (totem_object_is_fullscreen (totem) != FALSE) return; /* Save the size of the video widget */ @@ -1192,7 +1192,7 @@ totem_action_eject (TotemObject *totem) void totem_action_show_properties (TotemObject *totem) { - if (totem_is_fullscreen (totem) == FALSE) + if (totem_object_is_fullscreen (totem) == FALSE) totem_sidebar_set_current_page (totem, "properties", TRUE); } @@ -1428,7 +1428,7 @@ window_state_event_cb (GtkWidget *window, GdkEventWindowState *event, void totem_object_action_fullscreen_toggle (TotemObject *totem) { - if (totem_is_fullscreen (totem) != FALSE) + if (totem_object_is_fullscreen (totem) != FALSE) gtk_window_unfullscreen (GTK_WINDOW (totem->win)); else gtk_window_fullscreen (GTK_WINDOW (totem->win)); @@ -1444,7 +1444,7 @@ totem_object_action_fullscreen_toggle (TotemObject *totem) void totem_action_fullscreen (TotemObject *totem, gboolean state) { - if (totem_is_fullscreen (totem) == state) + if (totem_object_is_fullscreen (totem) == state) return; totem_object_action_fullscreen_toggle (totem); @@ -3080,7 +3080,7 @@ playlist_shuffle_toggle_cb (TotemPlaylist *playlist, GParamSpec *pspec, TotemObj } /** - * totem_is_fullscreen: + * totem_object_is_fullscreen: * @totem: a #TotemObject * * Returns %TRUE if Totem is fullscreened. @@ -3088,7 +3088,7 @@ playlist_shuffle_toggle_cb (TotemPlaylist *playlist, GParamSpec *pspec, TotemObj * Return value: %TRUE if Totem is fullscreened **/ gboolean -totem_is_fullscreen (TotemObject *totem) +totem_object_is_fullscreen (TotemObject *totem) { g_return_val_if_fail (TOTEM_IS_OBJECT (totem), FALSE); @@ -3383,7 +3383,7 @@ totem_action_handle_key_press (TotemObject *totem, GdkEventKey *event) case GDK_KEY_Return: if (!(event->state & GDK_CONTROL_MASK)) { GtkWidget *focus = gtk_window_get_focus (GTK_WINDOW (totem->win)); - if (totem_is_fullscreen (totem) != FALSE || focus == NULL || + if (totem_object_is_fullscreen (totem) != FALSE || focus == NULL || focus == GTK_WIDGET (totem->bvw) || focus == totem->seek) { if (event->keyval == GDK_KEY_space) { if (bacon_video_widget_is_playing (totem->bvw) == FALSE) diff --git a/src/totem.h b/src/totem.h index 9981ac588..f20dab51b 100644 --- a/src/totem.h +++ b/src/totem.h @@ -200,7 +200,7 @@ void totem_object_action_error (TotemObject *totem, const char *title, const char *reason); -gboolean totem_is_fullscreen (TotemObject *totem); +gboolean totem_object_is_fullscreen (TotemObject *totem); gboolean totem_object_is_playing (TotemObject *totem); gboolean totem_object_is_paused (TotemObject *totem); gboolean totem_object_is_seekable (TotemObject *totem); |