Move MidoriWebList and MidoriWebItem to Katze

katze/Makefile.am

@@ -14,4 +14,6 @@ libkatze_la_SOURCES = \
     katze.h                           \
     katze-throbber.c katze-throbber.h \
     katze-utils.c    katze-utils.h    \
+    katze-webitem.c  katze-webitem.h  \
+    katze-weblist.c  katze-weblist.h  \
     katze-xbel.c     katze-xbel.h

katze/katze-throbber.c

@@ -11,6 +11,8 @@
 
 #include "katze-throbber.h"
 
+#include "katze-utils.h"
+
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 

katze/katze-throbber.h

@@ -15,8 +15,6 @@
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 
-#include "katze-utils.h"
-
 G_BEGIN_DECLS
 
 #define KATZE_TYPE_THROBBER \

katze/katze-webitem.c

@@ -9,10 +9,11 @@
  See the file COPYING for the full license text.
 */
 
-#include "midori-webitem.h"
+#include "katze-webitem.h"
+
+#include "katze-utils.h"
 
 #include <glib/gi18n.h>
-#include <katze/katze.h>
 
 struct _MidoriWebItem
 {
@@ -366,7 +367,7 @@ midori_web_item_get_token (MidoriWebItem* web_item)
  **/
 void
 midori_web_item_set_token (MidoriWebItem* web_item,
-                          const gchar*   token)
+                           const gchar*   token)
 {
     g_return_if_fail (MIDORI_IS_WEB_ITEM (web_item));
 

katze/katze-weblist.c

@@ -9,7 +9,9 @@
  See the file COPYING for the full license text.
 */
 
-#include "midori-weblist.h"
+#include "katze-weblist.h"
+
+#include "katze-utils.h"
 
 #include <glib/gi18n.h>
 #include <string.h>

katze/katze-weblist.h

@@ -12,7 +12,7 @@
 #ifndef __MIDORI_WEB_LIST_H__
 #define __MIDORI_WEB_LIST_H__
 
-#include "midori-webitem.h"
+#include "katze-webitem.h"
 
 G_BEGIN_DECLS
 

katze/katze.h

@@ -14,6 +14,8 @@
 
 #include "katze-throbber.h"
 #include "katze-utils.h"
+#include "katze-webitem.h"
+#include "katze-weblist.h"
 #include "katze-xbel.h"
 
 #endif /* __KATZE_H__ */

midori/Makefile.am

@@ -20,9 +20,7 @@ bin_PROGRAMS = \
 
 midori_SOURCES = \
     main.c                 main.h                 \
-	gtkiconentry.c         gtkiconentry.h	      \
+    gtkiconentry.c         gtkiconentry.h         \
-    midori-webitem.c       midori-webitem.h       \
-    midori-weblist.c       midori-weblist.h       \
     midori-app.c           midori-app.h           \
     midori-browser.c       midori-browser.h       \
     midori-panel.c         midori-panel.h         \

midori/main.c

@@ -16,7 +16,6 @@
 #include "midori-app.h"
 #include "midori-websettings.h"
 #include "midori-browser.h"
-#include "midori-weblist.h"
 #include "gjs.h"
 
 #include <string.h>

midori/midori-app.c

@@ -11,8 +11,6 @@
 
 #include "midori-app.h"
 
-#include "midori-weblist.h"
-
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 

midori/midori-app.h

@@ -16,7 +16,6 @@
 
 #include "midori-browser.h"
 #include "midori-websettings.h"
-#include "midori-weblist.h"
 
 G_BEGIN_DECLS
 

midori/midori-panel.c

@@ -143,7 +143,7 @@ midori_panel_class_init (MidoriPanelClass* class)
                                      PROP_SHADOW_TYPE,
                                      g_param_spec_enum (
                                      "shadow-type",
-                                     "Shadow Type",
+                                     _("Shadow Type"),
                                      _("Appearance of the shadow around each panel"),
                                      GTK_TYPE_SHADOW_TYPE,
                                      GTK_SHADOW_NONE,
@@ -153,7 +153,7 @@ midori_panel_class_init (MidoriPanelClass* class)
                                      PROP_MENU,
                                      g_param_spec_object (
                                      "menu",
-                                     "Menu",
+                                     _("Menu"),
                                      _("Menu to hold panel items"),
                                      GTK_TYPE_MENU,
                                      G_PARAM_READWRITE));
@@ -162,7 +162,7 @@ midori_panel_class_init (MidoriPanelClass* class)
                                      PROP_PAGE,
                                      g_param_spec_int (
                                      "page",
-                                     "Page",
+                                     _("Page"),
                                      _("The index of the current page"),
                                      -1, G_MAXINT, -1,
                                      flags));

midori/midori-searchentry.c

@@ -13,7 +13,6 @@
 
 #include "sokoke.h"
 
-#include <katze/katze.h>
 #include <gdk/gdkkeysyms.h>
 #include <glib/gi18n.h>
 

midori/midori-searchentry.h

@@ -12,9 +12,10 @@
 #ifndef __MIDORI_SEARCH_ENTRY_H__
 #define __MIDORI_SEARCH_ENTRY_H__
 
-#include "midori-weblist.h"
 #include "gtkiconentry.h"
 
+#include <katze/katze.h>
+
 #include <gtk/gtk.h>
 
 G_BEGIN_DECLS

midori/midori-webview.h

@@ -13,7 +13,6 @@
 #define __MIDORI_WEB_VIEW_H__
 
 #include "midori-websettings.h"
-#include "midori-weblist.h"
 
 #include <katze/katze.h>
 #include <webkit/webkit.h>

midori/sokoke.c

@@ -11,8 +11,6 @@
 
 #include "sokoke.h"
 
-#include "midori-webitem.h"
-
 #include "config.h"
 #include "main.h"
 

midori/sokoke.h

@@ -12,7 +12,7 @@
 #ifndef __SOKOKE_H__
 #define __SOKOKE_H__ 1
 
-#include "midori-weblist.h"
+#include <katze/katze.h>
 
 #include <gtk/gtk.h>
 

po/POTFILES.in

@@ -10,11 +10,11 @@ midori/midori-panel.c
 midori/midori-websettings.c
 midori/midori-webview.c
 midori/midori-preferences.c
-midori/midori-webitem.c
-midori/midori-weblist.c
 midori/midori-searchentry.c
 midori/sokoke.c
 midori/gjs.c
 katze/katze-throbber.c
 katze/katze-utils.c
+katze/katze-webitem.c
+katze/katze-weblist.c
 katze/katze-xbel.c