diff options
| -rw-r--r-- | data/totem-preferences-dialog.ui (renamed from data/preferences.ui) | 0 | ||||
| -rw-r--r-- | data/totem.gresource.xml | 2 | ||||
| -rw-r--r-- | po/POTFILES.in | 4 | ||||
| -rw-r--r-- | src/meson.build | 4 | ||||
| -rw-r--r-- | src/totem-object.c | 2 | ||||
| -rw-r--r-- | src/totem-preferences-dialog.c (renamed from src/totem-preferences.c) | 4 | ||||
| -rw-r--r-- | src/totem-preferences-dialog.h (renamed from src/totem-preferences.h) | 0 |
7 files changed, 8 insertions, 8 deletions
diff --git a/data/preferences.ui b/data/totem-preferences-dialog.ui index a115255a3..a115255a3 100644 --- a/data/preferences.ui +++ b/data/totem-preferences-dialog.ui diff --git a/data/totem.gresource.xml b/data/totem.gresource.xml index 9fffc1a3d..53395d1fb 100644 --- a/data/totem.gresource.xml +++ b/data/totem.gresource.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <gresources> <gresource prefix="/org/gnome/totem/ui"> - <file compressed="true">preferences.ui</file> + <file compressed="true">totem-preferences-dialog.ui</file> </gresource> </gresources> diff --git a/po/POTFILES.in b/po/POTFILES.in index f35c6ff19..d83bc3ab5 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -5,7 +5,7 @@ data/controls.ui data/org.gnome.Totem.desktop.in.in data/org.gnome.totem.gschema.xml.in data/playlist.ui -data/preferences.ui +data/totem-preferences-dialog.ui data/shortcuts.ui data/totem.ui data/uri.ui @@ -25,7 +25,7 @@ src/totem-object.c src/totem-open-location.c src/totem-options.c src/totem-playlist.c -src/totem-preferences.c +src/totem-preferences-dialog.c src/totemselectiontoolbar.ui src/totem-subtitle-encoding.c src/totem-uri.c diff --git a/src/meson.build b/src/meson.build index 6b359d633..7fed9f1b2 100644 --- a/src/meson.build +++ b/src/meson.build @@ -20,7 +20,7 @@ enum_headers = files( 'totem-open-location.h', 'totem-options.h', 'totem-playlist.h', - 'totem-preferences.h', + 'totem-preferences-dialog.h', 'totem-private.h', 'totem-profile.h', 'totem-resources.h', @@ -121,7 +121,7 @@ libtotem_sources = files( 'totem-open-location.c', 'totem-options.c', 'totem-playlist.c', - 'totem-preferences.c', + 'totem-preferences-dialog.c', 'totem-search-entry.c', 'totem-selection-toolbar.c', 'totem-session.c', diff --git a/src/totem-object.c b/src/totem-object.c index 626ba821a..87720b648 100644 --- a/src/totem-object.c +++ b/src/totem-object.c @@ -57,7 +57,7 @@ #include "totem-menu.h" #include "totem-uri.h" #include "totem-interface.h" -#include "totem-preferences.h" +#include "totem-preferences-dialog.h" #include "totem-session.h" #include "totem-main-toolbar.h" diff --git a/src/totem-preferences.c b/src/totem-preferences-dialog.c index e8579e45d..3f5ced837 100644 --- a/src/totem-preferences.c +++ b/src/totem-preferences-dialog.c @@ -39,7 +39,7 @@ #include "bacon-video-widget-enums.h" #include "totem.h" #include "totem-private.h" -#include "totem-preferences.h" +#include "totem-preferences-dialog.h" #include "totem-interface.h" #include "totem-subtitle-encoding.h" #include "totem-plugins-engine.h" @@ -384,7 +384,7 @@ totem_preferences_dialog_class_init (TotemPreferencesDialogClass *klass) g_object_class_install_properties (object_class, N_PROPS, properties); - gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/totem/ui/preferences.ui"); + gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/totem/ui/totem-preferences-dialog.ui"); gtk_widget_class_bind_template_child (widget_class, TotemPreferencesDialog, font_sel_button); gtk_widget_class_bind_template_child (widget_class, TotemPreferencesDialog, tpw_auto_subtitles_checkbutton); diff --git a/src/totem-preferences.h b/src/totem-preferences-dialog.h index af30e9cd8..af30e9cd8 100644 --- a/src/totem-preferences.h +++ b/src/totem-preferences-dialog.h |