Rename main.h to midori-stock.h

diff --git a/midori/Makefile.am b/midori/Makefile.am
index 73229a721f83ae9ab4cba2377cadb4aaf9583487..ffe49e566b0407660cead1793dc693f74d818a7d 100644 (file)
--- 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 267cb53a8b2269b22ee81910bad762220ab60e5e..b7d6f8b22ddd4f0f24c4edd7e1418b3f74b74fa4 100644 (file)
--- 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/main.h b/midori/main.h
deleted file mode 100644 (file)
index b2a3b89..0000000
--- a/midori/main.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- Copyright (C) 2007-2008 Christian Dywan <christian@twotoasts.de>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- See the file COPYING for the full license text.
-*/
-
-#ifndef __MAIN_H__
-#define __MAIN_H__ 1
-
-#include <gtk/gtk.h>
-
-/* Custom stock items
-
-   We should distribute these
-   Names should match with epiphany and/ or xdg spec */
-
-#define STOCK_BOOKMARK           "stock_bookmark"
-#define STOCK_BOOKMARKS          "vcard"
-#define STOCK_CONSOLE            "terminal"
-#define STOCK_DISABLE            "list-remove"
-#define STOCK_ENABLE             "list-add"
-#define STOCK_EXTENSION          "extension"
-#define STOCK_EXTENSIONS         "extension"
-#define STOCK_HISTORY            "document-open-recent"
-#define STOCK_NEWS_FEED          "news-feed"
-#define STOCK_PAGE_HOLDER        "page-holder"
-#define STOCK_STYLE              "gnome-settings-theme"
-#define STOCK_STYLES             "gnome-settings-theme"
-#define STOCK_TRANSFER           "package"
-#define STOCK_TRANSFERS          "package"
-
-/* We assume that these legacy icon names are usually present */
-
-#define STOCK_BOOKMARK_ADD       "stock_add-bookmark"
-#define STOCK_HOMEPAGE           GTK_STOCK_HOME
-#define STOCK_IMAGE              "gnome-mime-image"
-#define STOCK_NETWORK_OFFLINE    "network-offline"
-#define STOCK_SCRIPT             "stock_script"
-#define STOCK_SCRIPTS            "stock_script"
-#define STOCK_SEND               "stock_mail-send"
-#define STOCK_TAB_NEW            "stock_new-tab"
-#define STOCK_USER_TRASH         "gnome-stock-trash"
-#define STOCK_WINDOW_NEW         "stock_new-window"
-
-/* For backwards compatibility */
-
-#if !GTK_CHECK_VERSION(2, 10, 0)
-#define GTK_STOCK_SELECT_ALL     "gtk-select-all"
-#endif
-#if !GTK_CHECK_VERSION(2, 8, 0)
-#define GTK_STOCK_FULLSCREEN "gtk-fullscreen"
-#define GTK_STOCK_LEAVE_FULLSCREEN "gtk-leave-fullscreen"
-#endif
-
-#endif /* !__MAIN_H__ */

diff --git a/midori/midori-addons.c b/midori/midori-addons.c
index 6936756cdc9a1951f7381cbc956ae5d6bddfdf8e..9842a468d36d0410369a62d12c3d8e81389c80b1 100644 (file)
--- 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 4f6a1089d33e09e7a38fa4d7e69fcd23126fb84d..a005e453b012e90088f4971dcea1eab747be689b 100644 (file)
--- 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 6a45992e6212d384297daa32280348b04141e922..75feb5ac5be27f46fbc1e06d6a02509492e65822 100644 (file)
--- 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/midori-stock.h b/midori/midori-stock.h
new file mode 100644 (file)
index 0000000..caa467b
--- /dev/null
+++ b/midori/midori-stock.h
@@ -0,0 +1,60 @@
+/*
+ Copyright (C) 2007-2008 Christian Dywan <christian@twotoasts.de>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ See the file COPYING for the full license text.
+*/
+
+#ifndef __MIDORI_STOCK_H__
+#define __MIDORI_STOCK_H__ 1
+
+#include <gtk/gtk.h>
+
+/* Custom stock items
+
+   We should distribute these
+   Names should match with epiphany and/ or xdg spec */
+
+#define STOCK_BOOKMARK           "stock_bookmark"
+#define STOCK_BOOKMARKS          "vcard"
+#define STOCK_CONSOLE            "terminal"
+#define STOCK_DISABLE            "list-remove"
+#define STOCK_ENABLE             "list-add"
+#define STOCK_EXTENSION          "extension"
+#define STOCK_EXTENSIONS         "extension"
+#define STOCK_HISTORY            "document-open-recent"
+#define STOCK_NEWS_FEED          "news-feed"
+#define STOCK_PAGE_HOLDER        "page-holder"
+#define STOCK_STYLE              "gnome-settings-theme"
+#define STOCK_STYLES             "gnome-settings-theme"
+#define STOCK_TRANSFER           "package"
+#define STOCK_TRANSFERS          "package"
+
+/* We assume that these legacy icon names are usually present */
+
+#define STOCK_BOOKMARK_ADD       "stock_add-bookmark"
+#define STOCK_HOMEPAGE           GTK_STOCK_HOME
+#define STOCK_IMAGE              "gnome-mime-image"
+#define STOCK_NETWORK_OFFLINE    "network-offline"
+#define STOCK_SCRIPT             "stock_script"
+#define STOCK_SCRIPTS            "stock_script"
+#define STOCK_SEND               "stock_mail-send"
+#define STOCK_TAB_NEW            "stock_new-tab"
+#define STOCK_USER_TRASH         "gnome-stock-trash"
+#define STOCK_WINDOW_NEW         "stock_new-window"
+
+/* For backwards compatibility */
+
+#if !GTK_CHECK_VERSION(2, 10, 0)
+#define GTK_STOCK_SELECT_ALL     "gtk-select-all"
+#endif
+#if !GTK_CHECK_VERSION(2, 8, 0)
+#define GTK_STOCK_FULLSCREEN "gtk-fullscreen"
+#define GTK_STOCK_LEAVE_FULLSCREEN "gtk-leave-fullscreen"
+#endif
+
+#endif /* !__MIDORI_STOCK_H__ */

diff --git a/midori/midori-webview.c b/midori/midori-webview.c
index eecea9930c0246ec5c67a8b1ce6cc8ee500be339..301b82f240d4988a02e9323c74bc2f91d9f1a46c 100644 (file)
--- 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 fadd5245b1342049d3e348c2fad2a8aa9ff3f3fd..063c88c249fba9a64cf5c533c8382ddcdcf88ee4 100644 (file)
--- 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>