From 90b80fc8a7d54621ab6010438573f9c847e27f0d Mon Sep 17 00:00:00 2001
From: Anna Schumaker <Anna@NoWheyCreamery.com>
Date: Fri, 19 Aug 2016 09:37:44 -0400
Subject: [PATCH] gui/window: Rename widget to "window"

Drop the "o_" prefix since it doesn't really add anything.

Signed-off-by: Anna Schumaker <Anna@NoWheyCreamery.com>
---
 include/gui/window.h     | 2 +-
 share/ocarina/ocarina.ui | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/gui/window.h b/include/gui/window.h
index f401f065..d004e55a 100644
--- a/include/gui/window.h
+++ b/include/gui/window.h
@@ -14,7 +14,7 @@ void gui_window_deinit();
 /* Called to get a pointer to the main window. */
 static inline GtkWindow *gui_window()
 {
-	return GTK_WINDOW(gui_builder_widget("o_window"));
+	return GTK_WINDOW(gui_builder_widget("window"));
 }
 
 #endif /* OCARINA_GUI_WINDOW_H */
diff --git a/share/ocarina/ocarina.ui b/share/ocarina/ocarina.ui
index 16ddb58f..db63b6a2 100644
--- a/share/ocarina/ocarina.ui
+++ b/share/ocarina/ocarina.ui
@@ -96,7 +96,7 @@
     <property name="step_increment">1000000000</property>
     <property name="page_increment">10000000000</property>
   </object>
-  <object class="GtkWindow" id="o_window">
+  <object class="GtkWindow" id="window">
     <property name="visible">True</property>
     <property name="can_focus">True</property>
     <property name="title" translatable="yes">Ocarina 6.1.3</property>