[geary/wip/765516-gtk-widget-conversation-viewer: 53/174] Rename conversation-message-menu.ui to conversation-email-menus.ui.



commit 4c29dd3ada45587a1b758d1d41f1c1fc24fcaf0e
Author: Michael James Gratton <mike vee net>
Date:   Sat Apr 23 17:21:33 2016 +1000

    Rename conversation-message-menu.ui to conversation-email-menus.ui.
    
    Make it actually match its parent class and use.

 .../conversation-viewer/conversation-email.vala    |    2 +-
 ui/CMakeLists.txt                                  |    2 +-
 ...message-menu.ui => conversation-email-menus.ui} |    0
 3 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/src/client/conversation-viewer/conversation-email.vala 
b/src/client/conversation-viewer/conversation-email.vala
index 0654880..bceb53c 100644
--- a/src/client/conversation-viewer/conversation-email.vala
+++ b/src/client/conversation-viewer/conversation-email.vala
@@ -227,7 +227,7 @@ public class ConversationEmail : Gtk.Box {
         primary_message.summary_box.pack_start(action_box, false, false, 0);
 
         Gtk.Builder builder = new Gtk.Builder.from_resource(
-            "/org/gnome/Geary/conversation-message-menu.ui"
+            "/org/gnome/Geary/conversation-email-menus.ui"
         );
         email_menubutton.set_menu_model((MenuModel) builder.get_object("email_menu"));
         email_menubutton.set_sensitive(false);
diff --git a/ui/CMakeLists.txt b/ui/CMakeLists.txt
index 6ef8c17..b70d785 100644
--- a/ui/CMakeLists.txt
+++ b/ui/CMakeLists.txt
@@ -9,8 +9,8 @@ set(RESOURCE_LIST
   STRIPBLANKS "composer-menus.ui"
   STRIPBLANKS "composer-widget.ui"
   STRIPBLANKS "conversation-email.ui"
+  STRIPBLANKS "conversation-email-menus.ui"
   STRIPBLANKS "conversation-message.ui"
-  STRIPBLANKS "conversation-message-menu.ui"
   STRIPBLANKS "conversation-viewer.ui"
               "conversation-web-view.css"
   STRIPBLANKS "edit_alternate_emails.glade"
diff --git a/ui/conversation-message-menu.ui b/ui/conversation-email-menus.ui
similarity index 100%
rename from ui/conversation-message-menu.ui
rename to ui/conversation-email-menus.ui


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