Rename main.h to midori-stock.h

midori/Makefile.am

@@ -21,7 +21,7 @@ bin_PROGRAMS = \
     midori
 
 midori_SOURCES = \
-    main.c                 main.h                 \
+    main.c                 midori-stock.h         \
     gtkiconentry.c         gtkiconentry.h         \
     midori-app.c           midori-app.h           \
     midori-browser.c       midori-browser.h       \

midori/main.c

@@ -13,13 +13,12 @@
     #include <config.h>
 #endif
 
-#include "main.h"
-
-#include "sokoke.h"
-
 #include "midori-app.h"
 #include "midori-websettings.h"
 #include "midori-browser.h"
+#include "midori-stock.h"
+
+#include "sokoke.h"
 #include "gjs.h"
 
 #include <string.h>

midori/midori-addons.c

@@ -15,7 +15,7 @@
 #endif
 
 #include "midori-addons.h"
-#include "main.h"
+#include "midori-stock.h"
 
 #include "sokoke.h"
 #include "gjs.h"

midori/midori-browser.c

@@ -15,9 +15,6 @@
 
 #include "midori-browser.h"
 
-#include "main.h"
-#include "gtkiconentry.h"
-#include "sokoke.h"
 #include "midori-webview.h"
 #include "midori-preferences.h"
 #include "midori-panel.h"
@@ -25,7 +22,11 @@
 #include "midori-console.h"
 #include "midori-searchentry.h"
 #include "midori-locationaction.h"
+#include "midori-stock.h"
+
+#include "gtkiconentry.h"
 #include "compat.h"
+#include "sokoke.h"
 #include "gjs.h"
 
 #if HAVE_GIO

midori/midori-locationaction.c

@@ -11,10 +11,10 @@
 
 #include "midori-locationaction.h"
 
-#include "main.h"
 #include "gtkiconentry.h"
 
 #include <katze/katze.h>
+#include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 

midori/midori-stock.h

@@ -9,8 +9,8 @@
  See the file COPYING for the full license text.
 */
 
-#ifndef __MAIN_H__
+#ifndef __MIDORI_STOCK_H__
-#define __MAIN_H__ 1
+#define __MIDORI_STOCK_H__ 1
 
 #include <gtk/gtk.h>
 
@@ -57,4 +57,4 @@
 #define GTK_STOCK_LEAVE_FULLSCREEN "gtk-leave-fullscreen"
 #endif
 
-#endif /* !__MAIN_H__ */
+#endif /* !__MIDORI_STOCK_H__ */

midori/midori-webview.c

@@ -14,11 +14,11 @@
 #endif
 
 #include "midori-webview.h"
+#include "midori-stock.h"
 
-#include "main.h"
-#include "gjs.h"
-#include "sokoke.h"
 #include "compat.h"
+#include "sokoke.h"
+#include "gjs.h"
 
 #include <string.h>
 #if HAVE_GIO

midori/sokoke.c

@@ -14,7 +14,6 @@
 #endif
 
 #include "sokoke.h"
-#include "main.h"
 
 #if HAVE_UNISTD_H
     #include <unistd.h>