From 131b911ab57b8b7e6f71de768af4eaa384aff13b Mon Sep 17 00:00:00 2001
From: Christian Dywan <christian@twotoasts.de>
Date: Wed, 3 Sep 2008 02:39:25 +0200
Subject: [PATCH] Rename main.h to midori-stock.h

---
 midori/Makefile.am                | 2 +-
 midori/main.c                     | 7 +++----
 midori/midori-addons.c            | 2 +-
 midori/midori-browser.c           | 7 ++++---
 midori/midori-locationaction.c    | 2 +-
 midori/{main.h => midori-stock.h} | 6 +++---
 midori/midori-webview.c           | 6 +++---
 midori/sokoke.c                   | 1 -
 8 files changed, 16 insertions(+), 17 deletions(-)
 rename midori/{main.h => midori-stock.h} (95%)

diff --git a/midori/Makefile.am b/midori/Makefile.am
index 73229a72..ffe49e56 100644
--- a/midori/Makefile.am
+++ b/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       \
diff --git a/midori/main.c b/midori/main.c
index 267cb53a..b7d6f8b2 100644
--- a/midori/main.c
+++ b/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>
diff --git a/midori/midori-addons.c b/midori/midori-addons.c
index 6936756c..9842a468 100644
--- a/midori/midori-addons.c
+++ b/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"
diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index 4f6a1089..a005e453 100644
--- a/midori/midori-browser.c
+++ b/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
diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c
index 6a45992e..75feb5ac 100644
--- a/midori/midori-locationaction.c
+++ b/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>
 
diff --git a/midori/main.h b/midori/midori-stock.h
similarity index 95%
rename from midori/main.h
rename to midori/midori-stock.h
index b2a3b89f..caa467b7 100644
--- a/midori/main.h
+++ b/midori/midori-stock.h
@@ -9,8 +9,8 @@
  See the file COPYING for the full license text.
 */
 
-#ifndef __MAIN_H__
-#define __MAIN_H__ 1
+#ifndef __MIDORI_STOCK_H__
+#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__ */
diff --git a/midori/midori-webview.c b/midori/midori-webview.c
index eecea993..301b82f2 100644
--- a/midori/midori-webview.c
+++ b/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
diff --git a/midori/sokoke.c b/midori/sokoke.c
index fadd5245..063c88c2 100644
--- a/midori/sokoke.c
+++ b/midori/sokoke.c
@@ -14,7 +14,6 @@
 #endif
 
 #include "sokoke.h"
-#include "main.h"
 
 #if HAVE_UNISTD_H
     #include <unistd.h>