[epiphany] Rename epiphany.ui to encoding-dialog.ui



commit 954b6e6e62b381974db31d895e85af0012aa2af0
Author: Michael Catanzaro <mcatanzaro igalia com>
Date:   Wed Aug 6 15:29:25 2014 -0500

    Rename epiphany.ui to encoding-dialog.ui
    
    It only contains the encoding dialog
    
    https://bugzilla.gnome.org/show_bug.cgi?id=734379

 po/POTFILES.in                                    |    2 +-
 src/Makefile.am                                   |    2 +-
 src/ephy-encoding-dialog.c                        |    2 +-
 src/epiphany.gresource.xml                        |    2 +-
 src/resources/{epiphany.ui => encoding-dialog.ui} |    0
 5 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/po/POTFILES.in b/po/POTFILES.in
index b626774..e191525 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -42,8 +42,8 @@ src/bookmarks/ephy-topics-entry.c
 src/bookmarks/ephy-topics-palette.c
 [type: gettext/glade]src/resources/clear-data-dialog.ui
 [type: gettext/glade]src/resources/cookies-dialog.ui
+[type: gettext/glade]src/resources/encoding-dialog.ui
 [type: gettext/glade]src/resources/epiphany-application-menu.ui
-[type: gettext/glade]src/resources/epiphany.ui
 [type: gettext/glade]src/resources/history-dialog.ui
 [type: gettext/glade]src/resources/passwords-dialog.ui
 [type: gettext/glade]src/resources/prefs-dialog.ui
diff --git a/src/Makefile.am b/src/Makefile.am
index 69f8185..e5c8a0c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -105,11 +105,11 @@ RESOURCE_FILES = \
        resources/about.css                       \
        resources/clear-data-dialog.ui            \
        resources/cookies-dialog.ui               \
+       resources/encoding-dialog.ui              \
        resources/epiphany-application-menu.ui    \
        resources/epiphany-bookmark-editor-ui.xml \
        resources/epiphany-ui.xml                 \
        resources/epiphany.css                    \
-       resources/epiphany.ui                     \
        resources/error.html                      \
        resources/history-dialog.ui               \
        resources/incognito-tinted.png            \
diff --git a/src/ephy-encoding-dialog.c b/src/ephy-encoding-dialog.c
index 64a39f4..d7e8897 100644
--- a/src/ephy-encoding-dialog.c
+++ b/src/ephy-encoding-dialog.c
@@ -341,7 +341,7 @@ ephy_encoding_dialog_init (EphyEncodingDialog *dialog)
                                (EPHY_EMBED_SHELL (ephy_shell_get_default ())));
 
        ephy_dialog_construct (EPHY_DIALOG (dialog),
-                              "/org/gnome/epiphany/epiphany.ui",
+                              "/org/gnome/epiphany/encoding-dialog.ui",
                               "encoding_dialog",
                               NULL);
 
diff --git a/src/epiphany.gresource.xml b/src/epiphany.gresource.xml
index 4197dc8..55ee118 100644
--- a/src/epiphany.gresource.xml
+++ b/src/epiphany.gresource.xml
@@ -3,7 +3,7 @@
   <gresource prefix="/org/gnome/epiphany">
     <file>incognito.png</file>
     <file>incognito-tinted.png</file>
-    <file preprocess="xml-stripblanks" compressed="true">epiphany.ui</file>
+    <file preprocess="xml-stripblanks" compressed="true">encoding-dialog.ui</file>
     <file preprocess="xml-stripblanks" compressed="true">prefs-dialog.ui</file>
     <file preprocess="xml-stripblanks" compressed="true">prefs-lang-dialog.ui</file>
     <file preprocess="xml-stripblanks" compressed="true">clear-data-dialog.ui</file>
diff --git a/src/resources/epiphany.ui b/src/resources/encoding-dialog.ui
similarity index 100%
rename from src/resources/epiphany.ui
rename to src/resources/encoding-dialog.ui


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