s/classes/clib/g

Makefile

@@ -6,8 +6,8 @@ TLIST = common/tokenize.list
 THEAD = common/tokenize.h
 TSRC  = common/tokenize.c
 
-SRCS  = $(filter-out $(TSRC),$(wildcard *.c) $(wildcard common/*.c) $(wildcard classes/*.c) $(wildcard classes/soup/*.c) $(wildcard widgets/*.c)) $(TSRC)
-HEADS = $(wildcard *.h) $(wildcard common/*.h) $(wildcard widgets/*.h) $(wildcard classes/*.h) $(wildcard classes/soup/*.h) $(THEAD) globalconf.h
+SRCS  = $(filter-out $(TSRC),$(wildcard *.c) $(wildcard common/*.c) $(wildcard clib/*.c) $(wildcard clib/soup/*.c) $(wildcard widgets/*.c)) $(TSRC)
+HEADS = $(wildcard *.h) $(wildcard common/*.h) $(wildcard widgets/*.h) $(wildcard clib/*.h) $(wildcard clib/soup/*.h) $(THEAD) globalconf.h
 OBJS  = $(foreach obj,$(SRCS:.c=.o),$(obj))
 
 all: options newline luakit luakit.1

clib/download.c

@@ -21,7 +21,7 @@
  */
 
 #include "common/luaobject.h"
-#include "classes/download.h"
+#include "clib/download.h"
 #include "luah.h"
 #include "globalconf.h"
 

clib/download.h

@@ -1,5 +1,5 @@
 /*
- * classes/download.h - WebKitDownload wrapper header
+ * clib/download.h - WebKitDownload wrapper header
  *
  * Copyright (C) 2011 Fabian Streitel <[email protected]>
  * Copyright (C) 2011 Mason Larobina <[email protected]>
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef LUAKIT_CLASSES_DOWNLOAD_H
-#define LUAKIT_CLASSES_DOWNLOAD_H
+#ifndef LUAKIT_CLIB_DOWNLOAD_H
+#define LUAKIT_CLIB_DOWNLOAD_H
 
 #include <lua.h>
 #include <webkit/webkitdownload.h>

clib/soup/auth.c

@@ -1,5 +1,5 @@
 /*
- * classes/soup/auth.c - authentication management
+ * clib/soup/auth.c - authentication management
  *
  * Copyright (C) 2009 Igalia S.L.
  * Copyright (C) 2010 Fabian Streitel <[email protected]>
@@ -19,7 +19,7 @@
  *
  */
 
-#include "classes/soup/soup.h"
+#include "clib/soup/soup.h"
 #include "luah.h"
 
 #include <gtk/gtk.h>

clib/soup/auth.h

@@ -1,5 +1,5 @@
 /*
- * classes/soup/auth.h - authentication management header
+ * clib/soup/auth.h - authentication management header
  *
  * Copyright (C) 2009 Igalia S.L.
  * Copyright (C) 2010 Fabian Streitel <[email protected]>
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef LUAKIT_CLASSES_SOUP_AUTH_H
-#define LUAKIT_CLASSES_SOUP_AUTH_H
+#ifndef LUAKIT_CLIB_SOUP_AUTH_H
+#define LUAKIT_CLIB_SOUP_AUTH_H
 
 #include <glib-object.h>
 

clib/soup/cookiejar.c

@@ -1,5 +1,5 @@
 /*
- * classes/soup/cookiejar.c - LuakitCookieJar
+ * clib/soup/cookiejar.c - LuakitCookieJar
  *
  * Copyright (C) 2011 Mason Larobina <[email protected]>
  *
@@ -19,7 +19,7 @@
  *
  */
 
-#include "classes/soup/soup.h"
+#include "clib/soup/soup.h"
 #include "luah.h"
 
 #include <libsoup/soup-cookie.h>

clib/soup/cookiejar.h

@@ -1,5 +1,5 @@
 /*
- * classes/soup/cookiejar.h - LuakitCookieJar header
+ * clib/soup/cookiejar.h - LuakitCookieJar header
  *
  * Copyright (C) 2011 Mason Larobina <[email protected]>
  *
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef LUAKIT_CLASSES_SOUP_COOKIEJAR_H
-#define LUAKIT_CLASSES_SOUP_COOKIEJAR_H
+#ifndef LUAKIT_CLIB_SOUP_COOKIEJAR_H
+#define LUAKIT_CLIB_SOUP_COOKIEJAR_H
 
 #include "luah.h"
 

clib/soup/soup.c

@@ -1,5 +1,5 @@
 /*
- * classes/soup/soup.c - soup library
+ * clib/soup/soup.c - soup library
  *
  * Copyright (C) 2011 Mason Larobina <[email protected]>
  *
@@ -18,7 +18,7 @@
  *
  */
 
-#include "classes/soup/soup.h"
+#include "clib/soup/soup.h"
 #include "common/property.h"
 
 #include <libsoup/soup.h>

clib/soup/soup.h

@@ -1,5 +1,5 @@
 /*
- * classes/soup/soup.h - soup library
+ * clib/soup/soup.h - soup library
  *
  * Copyright (C) 2011 Mason Larobina <[email protected]>
  *
@@ -18,11 +18,11 @@
  *
  */
 
-#ifndef LUAKIT_CLASSES_SOUP_H
-#define LUAKIT_CLASSES_SOUP_H
+#ifndef LUAKIT_CLIB_SOUP_H
+#define LUAKIT_CLIB_SOUP_H
 
-#include "classes/soup/cookiejar.h"
-#include "classes/soup/auth.h"
+#include "clib/soup/cookiejar.h"
+#include "clib/soup/auth.h"
 #include "luah.h"
 
 #include <libsoup/soup-session.h>

clib/sqlite3.c

@@ -1,5 +1,5 @@
 /*
- * classes/sqlite3.c - luakit sqlite3 wrapper
+ * clib/sqlite3.c - luakit sqlite3 wrapper
  *
  * Copyright (C) 2011 Mason Larobina <[email protected]>
  *
@@ -21,7 +21,7 @@
 #include <sqlite3.h>
 #include <time.h>
 
-#include "classes/sqlite3.h"
+#include "clib/sqlite3.h"
 #include "common/luaobject.h"
 #include "common/luaclass.h"
 

clib/sqlite3.h

@@ -1,5 +1,5 @@
 /*
- * classes/sqlite3.h - luakit sqlite3 wrapper
+ * clib/sqlite3.h - luakit sqlite3 wrapper
  *
  * Copyright (C) 2011 Mason Larobina <[email protected]>
  *
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef LUAKIT_CLASSES_SQLITE3_H
-#define LUAKIT_CLASSES_SQLITE3_H
+#ifndef LUAKIT_CLIB_SQLITE3_H
+#define LUAKIT_CLIB_SQLITE3_H
 
 #include <lua.h>
 

clib/timer.c

@@ -19,7 +19,7 @@
  *
  */
 
-#include "classes/timer.h"
+#include "clib/timer.h"
 #include "common/luaobject.h"
 #include "globalconf.h"
 #include "luah.h"

clib/timer.h

@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef LUAKIT_CLASSES_TIMER_H
-#define LUAKIT_CLASSES_TIMER_H
+#ifndef LUAKIT_CLIB_TIMER_H
+#define LUAKIT_CLIB_TIMER_H
 
 #include <lua.h>
 

clib/widget.c

@@ -1,5 +1,5 @@
 /*
- * widget.c - widget managing
+ * clib/widget.c - widget managing
  *
  * Copyright (C) 2010 Mason Larobina <[email protected]>
  * Copyright (C) 2007-2009 Julien Danjou <[email protected]>
@@ -19,7 +19,7 @@
  *
  */
 
-#include "classes/widget.h"
+#include "clib/widget.h"
 
 widget_info_t widgets_list[] = {
   { L_TK_ENTRY,      "entry",      widget_entry      },

clib/widget.h

@@ -1,5 +1,5 @@
 /*
- * widget.h - widget managing header
+ * clib/widget.h - widget managing header
  *
  * Copyright (C) 2010 Mason Larobina <[email protected]>
  * Copyright (C) 2007-2009 Julien Danjou <[email protected]>
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef LUAKIT_CLASSES_WIDGET_H
-#define LUAKIT_CLASSES_WIDGET_H
+#ifndef LUAKIT_CLIB_WIDGET_H
+#define LUAKIT_CLIB_WIDGET_H
 
 typedef struct widget_t widget_t;
 

common/property.c

@@ -19,7 +19,7 @@
  */
 
 #include "common/property.h"
-#include "classes/soup/soup.h"
+#include "clib/soup/soup.h"
 
 #include <webkit/webkit.h>
 

luah.c

@@ -21,11 +21,11 @@
 
 #include "common/util.h"
 #include "common/lualib.h"
-#include "classes/download.h"
-#include "classes/soup/soup.h"
-#include "classes/sqlite3.h"
-#include "classes/timer.h"
-#include "classes/widget.h"
+#include "clib/download.h"
+#include "clib/soup/soup.h"
+#include "clib/sqlite3.h"
+#include "clib/timer.h"
+#include "clib/widget.h"
 #include "luakit.h"
 #include "luah.h"
 

widgets/common.h

@@ -21,7 +21,7 @@
 #ifndef LUAKIT_WIDGETS_COMMON_H
 #define LUAKIT_WIDGETS_COMMON_H
 
-#include "classes/widget.h"
+#include "clib/widget.h"
 
 #define LUAKIT_WIDGET_INDEX_COMMON                    \
     case L_TK_SHOW:                                   \

widgets/webview.c

@@ -27,8 +27,8 @@
 #include "globalconf.h"
 #include "luah.h"
 #include "widgets/common.h"
-#include "classes/download.h"
-#include "classes/soup/soup.h"
+#include "clib/download.h"
+#include "clib/soup/soup.h"
 #include "common/property.h"
 
 GHashTable *frames_by_view = NULL;

widgets/window.c

@@ -22,7 +22,7 @@
 #include <gdk/gdkx.h>
 #include "luah.h"
 #include "widgets/common.h"
-#include "classes/soup/auth.h"
+#include "clib/soup/auth.h"
 
 static void
 destroy_cb(GtkObject *win, widget_t *w)