GNOME.org
 

devhelp r1201 - in trunk: . src

Author: rhult
Date: Fri Oct 10 19:11:53 2008
New Revision: 1201
URL: http://svn.gnome.org/viewvc/devhelp?rev=1201&view=rev

Log:
2008-10-10  Richard Hult  <richard imendio com>

	* src/*.h: Add begin/end decl macros for consistency.


Modified:
   trunk/ChangeLog
   trunk/src/dh-assistant.h
   trunk/src/dh-base.h
   trunk/src/dh-book-tree.h
   trunk/src/dh-error.h
   trunk/src/dh-keyword-model.h
   trunk/src/dh-parser.h
   trunk/src/dh-preferences.c
   trunk/src/dh-preferences.h
   trunk/src/dh-search.h
   trunk/src/dh-util.h
   trunk/src/dh-window.h

Modified: trunk/src/dh-assistant.h
==============================================================================
--- trunk/src/dh-assistant.h	(original)
+++ trunk/src/dh-assistant.h	Fri Oct 10 19:11:53 2008
@@ -24,6 +24,8 @@
 #include <gtk/gtk.h>
 #include "dh-base.h"
 
+G_BEGIN_DECLS
+
 #define DH_TYPE_ASSISTANT         (dh_assistant_get_type ())
 #define DH_ASSISTANT(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), DH_TYPE_ASSISTANT, DhAssistant))
 #define DH_ASSISTANT_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST ((k), DH_TYPE_ASSISTANT, DhAssistantClass))
@@ -47,4 +49,6 @@
 gboolean   dh_assistant_search    (DhAssistant *assistant,
                                    const gchar *str);
 
+G_END_DECLS
+
 #endif /* __DH_ASSISTANT_H__ */

Modified: trunk/src/dh-base.h
==============================================================================
--- trunk/src/dh-base.h	(original)
+++ trunk/src/dh-base.h	Fri Oct 10 19:11:53 2008
@@ -25,6 +25,8 @@
 
 #include <gtk/gtk.h>
 
+G_BEGIN_DECLS
+
 typedef struct _DhBase      DhBase;
 typedef struct _DhBaseClass DhBaseClass;
 
@@ -53,4 +55,6 @@
 GNode *      dh_base_get_book_tree                   (DhBase *base);
 GList *      dh_base_get_keywords                    (DhBase *base);
 
+G_END_DECLS
+
 #endif /* __DH_BASE_H__ */

Modified: trunk/src/dh-book-tree.h
==============================================================================
--- trunk/src/dh-book-tree.h	(original)
+++ trunk/src/dh-book-tree.h	Fri Oct 10 19:11:53 2008
@@ -24,6 +24,8 @@
 #include <gtk/gtk.h>
 #include "dh-link.h"
 
+G_BEGIN_DECLS
+
 #define DH_TYPE_BOOK_TREE            (dh_book_tree_get_type ())
 #define DH_BOOK_TREE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), DH_TYPE_BOOK_TREE, DhBookTree))
 #define DH_BOOK_TREE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), DH_TYPE_BOOK_TREE, DhBookTreeClass))
@@ -47,4 +49,6 @@
                                                    const gchar *uri);
 const gchar *dh_book_tree_get_selected_book_title (DhBookTree  *tree);
 
+G_END_DECLS
+
 #endif /* __DH_BOOK_TREE_H__ */

Modified: trunk/src/dh-error.h
==============================================================================
--- trunk/src/dh-error.h	(original)
+++ trunk/src/dh-error.h	Fri Oct 10 19:11:53 2008
@@ -24,6 +24,8 @@
 
 #include <glib.h>
 
+G_BEGIN_DECLS
+
 #define DH_ERROR dh_error_quark ()
 
 typedef enum {
@@ -35,4 +37,6 @@
 
 GQuark dh_error_quark (void) G_GNUC_CONST;
 
+G_END_DECLS
+
 #endif /* __DH_ERROR_H__ */

Modified: trunk/src/dh-keyword-model.h
==============================================================================
--- trunk/src/dh-keyword-model.h	(original)
+++ trunk/src/dh-keyword-model.h	Fri Oct 10 19:11:53 2008
@@ -25,6 +25,8 @@
 #include <gtk/gtk.h>
 #include "dh-link.h"
 
+G_BEGIN_DECLS
+
 #define DH_TYPE_KEYWORD_MODEL            (dh_keyword_model_get_type ())
 #define DH_KEYWORD_MODEL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), DH_TYPE_KEYWORD_MODEL, DhKeywordModel))
 #define DH_KEYWORD_MODEL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), DH_TYPE_KEYWORD_MODEL, DhKeywordModelClass))
@@ -61,4 +63,6 @@
                                             const gchar    *string,
                                             const gchar    *book_id);
 
+G_END_DECLS
+
 #endif /* __DH_KEYWORD_MODEL_H__ */

Modified: trunk/src/dh-parser.h
==============================================================================
--- trunk/src/dh-parser.h	(original)
+++ trunk/src/dh-parser.h	Fri Oct 10 19:11:53 2008
@@ -24,9 +24,13 @@
 
 #include <glib.h>
 
-gboolean  dh_parser_read_file (const gchar  *path,
-			       GNode        *book_tree,
-			       GList       **keywords,
-			       GError      **error);
+G_BEGIN_DECLS
+
+gboolean dh_parser_read_file (const gchar  *path,
+                              GNode        *book_tree,
+                              GList       **keywords,
+                              GError      **error);
+
+G_END_DECLS
 
 #endif /* __DH_PARSER_H__ */

Modified: trunk/src/dh-preferences.c
==============================================================================
--- trunk/src/dh-preferences.c	(original)
+++ trunk/src/dh-preferences.c	Fri Oct 10 19:11:53 2008
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */
 /*
- * Copyright (C) 2004-2006 Imendio AB
+ * Copyright (C) 2004-2008 Imendio AB
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as

Modified: trunk/src/dh-preferences.h
==============================================================================
--- trunk/src/dh-preferences.h	(original)
+++ trunk/src/dh-preferences.h	Fri Oct 10 19:11:53 2008
@@ -23,17 +23,10 @@
 
 #include <gtk/gtk.h>
 
-#define DH_CONF_PATH "/apps/devhelp"
+G_BEGIN_DECLS
 
-#define DH_CONF_MAIN_WINDOW_MAXIMIZED DH_CONF_PATH "/ui/main_window_maximized"
-#define DH_CONF_MAIN_WINDOW_WIDTH     DH_CONF_PATH "/ui/main_window_width"
-#define DH_CONF_MAIN_WINDOW_HEIGHT    DH_CONF_PATH "/ui/main_window_height"
-#define DH_CONF_MAIN_WINDOW_POS_X     DH_CONF_PATH "/ui/main_window_position_x"
-#define DH_CONF_MAIN_WINDOW_POS_Y     DH_CONF_PATH "/ui/main_window_position_y"
-#define DH_CONF_PANED_LOCATION        DH_CONF_PATH "/ui/paned_location"
-#define DH_CONF_SELECTED_TAB          DH_CONF_PATH "/ui/selected_tab"
+#define DH_CONF_PATH "/apps/devhelp"
 #define DH_CONF_USE_SYSTEM_FONTS      DH_CONF_PATH "/ui/use_system_fonts"
-#define DH_CONF_ADVANCED_OPTIONS      DH_CONF_PATH "/ui/show_advanced_search_options"
 #define DH_CONF_VARIABLE_FONT         DH_CONF_PATH "/ui/variable_font"
 #define DH_CONF_FIXED_FONT            DH_CONF_PATH "/ui/fixed_font"
 #define DH_CONF_SYSTEM_VARIABLE_FONT  "/desktop/gnome/interface/font_name"
@@ -42,5 +35,7 @@
 void dh_preferences_setup_fonts (void);
 void dh_preferences_show_dialog (GtkWindow *parent);
 
+G_END_DECLS
+
 #endif /* __DH_PREFERENCES_H__ */
 

Modified: trunk/src/dh-search.h
==============================================================================
--- trunk/src/dh-search.h	(original)
+++ trunk/src/dh-search.h	Fri Oct 10 19:11:53 2008
@@ -25,6 +25,8 @@
 #include <gtk/gtk.h>
 #include "dh-link.h"
 
+G_BEGIN_DECLS
+
 #define DH_TYPE_SEARCH           (dh_search_get_type ())
 #define DH_SEARCH(obj)           (G_TYPE_CHECK_INSTANCE_CAST ((obj), DH_TYPE_SEARCH, DhSearch))
 #define DH_SEARCH_CLASS(klass)   (G_TYPE_CHECK_CLASS_CAST ((klass), DH_TYPE_SEARCH, DhSearchClass))
@@ -52,4 +54,6 @@
                                         const gchar *str,
                                         const gchar *book_id);
 
+G_END_DECLS
+
 #endif /* __DH_SEARCH_H__ */

Modified: trunk/src/dh-util.h
==============================================================================
--- trunk/src/dh-util.h	(original)
+++ trunk/src/dh-util.h	Fri Oct 10 19:11:53 2008
@@ -24,6 +24,8 @@
 
 #include <gtk/gtk.h>
 
+G_BEGIN_DECLS
+
 GtkBuilder * dh_util_builder_get_file             (const gchar *filename,
                                                    const gchar *root,
                                                    const gchar *domain,
@@ -46,4 +48,6 @@
                                                    const gchar *page_name);
 const gchar *dh_util_state_get_notebook_page_name (GtkWidget   *page);
 
+G_END_DECLS
+
 #endif /* __DH_UTIL_H__ */

Modified: trunk/src/dh-window.h
==============================================================================
--- trunk/src/dh-window.h	(original)
+++ trunk/src/dh-window.h	Fri Oct 10 19:11:53 2008
@@ -26,6 +26,8 @@
 #include <gtk/gtk.h>
 #include "dh-base.h"
 
+G_BEGIN_DECLS
+
 #define DH_TYPE_WINDOW         (dh_window_get_type ())
 #define DH_WINDOW(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), DH_TYPE_WINDOW, DhWindow))
 #define DH_WINDOW_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST ((k), DH_TYPE_WINDOW, DhWindowClass))
@@ -55,4 +57,6 @@
 void       _dh_window_display_uri (DhWindow    *window,
                                    const gchar *uri);
 
+G_END_DECLS
+
 #endif /* __DH_WINDOW_H__ */
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]