diff options
Diffstat (limited to 'lib')
-rw-r--r-- | lib/ephy-file-chooser.c | 2 | ||||
-rw-r--r-- | lib/ephy-file-chooser.h | 12 | ||||
-rw-r--r-- | lib/ephy-node-db.c | 2 | ||||
-rw-r--r-- | lib/ephy-node-db.h | 2 | ||||
-rw-r--r-- | lib/ephy-node-filter.c | 4 | ||||
-rw-r--r-- | lib/ephy-node-filter.h | 4 | ||||
-rw-r--r-- | lib/ephy-node.c | 2 | ||||
-rw-r--r-- | lib/ephy-node.h | 2 | ||||
-rw-r--r-- | lib/widgets/ephy-node-view.c | 2 | ||||
-rw-r--r-- | lib/widgets/ephy-node-view.h | 2 | ||||
-rw-r--r-- | lib/widgets/ephy-search-entry.c | 2 | ||||
-rw-r--r-- | lib/widgets/ephy-search-entry.h | 2 | ||||
-rw-r--r-- | lib/widgets/ephy-spinner.c | 2 | ||||
-rw-r--r-- | lib/widgets/ephy-spinner.h | 10 | ||||
-rw-r--r-- | lib/widgets/ephy-tree-model-node.c | 2 | ||||
-rw-r--r-- | lib/widgets/ephy-tree-model-node.h | 2 | ||||
-rw-r--r-- | lib/widgets/ephy-tree-model-sort.c | 2 | ||||
-rw-r--r-- | lib/widgets/ephy-tree-model-sort.h | 2 | ||||
-rw-r--r-- | lib/widgets/ephy-zoom-action.c | 2 | ||||
-rw-r--r-- | lib/widgets/ephy-zoom-action.h | 10 |
20 files changed, 36 insertions, 34 deletions
diff --git a/lib/ephy-file-chooser.c b/lib/ephy-file-chooser.c index 1f3c80f63..ad6f2a624 100644 --- a/lib/ephy-file-chooser.c +++ b/lib/ephy-file-chooser.c @@ -34,7 +34,7 @@ #define EPHY_FILE_CHOOSER_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_FILE_CHOOSER, EphyFileChooserPrivate)) -struct EphyFileChooserPrivate +struct _EphyFileChooserPrivate { char *persist_key; }; diff --git a/lib/ephy-file-chooser.h b/lib/ephy-file-chooser.h index 5b576728a..81d28a5e4 100644 --- a/lib/ephy-file-chooser.h +++ b/lib/ephy-file-chooser.h @@ -36,7 +36,9 @@ G_BEGIN_DECLS #define EPHY_IS_FILE_CHOOSER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_FILE_CHOOSER)) #define EPHY_FILE_CHOOSER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EPHY_TYPE_FILE_CHOOSER, EphyFileChooserClass)) -typedef struct EphyFileChooserPrivate EphyFileChooserPrivate; +typedef struct _EphyFileChooser EphyFileChooser; +typedef struct _EphyFileChooserPrivate EphyFileChooserPrivate; +typedef struct _EphyFileChooserClass EphyFileChooserClass; typedef enum { @@ -48,18 +50,18 @@ typedef enum EPHY_FILE_FILTER_LAST = EPHY_FILE_FILTER_NONE } EphyFileFilterDefault; -typedef struct +struct _EphyFileChooser { GtkFileChooserDialog parent; /*< private >*/ EphyFileChooserPrivate *priv; -} EphyFileChooser; +}; -typedef struct +struct _EphyFileChooserClass { GtkFileChooserDialogClass parent_class; -} EphyFileChooserClass; +}; GType ephy_file_chooser_get_type (void); diff --git a/lib/ephy-node-db.c b/lib/ephy-node-db.c index 3774b63fd..591b7ec82 100644 --- a/lib/ephy-node-db.c +++ b/lib/ephy-node-db.c @@ -48,7 +48,7 @@ enum #define EPHY_NODE_DB_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_NODE_DB, EphyNodeDbPrivate)) -struct EphyNodeDbPrivate +struct _EphyNodeDbPrivate { char *name; gboolean immutable; diff --git a/lib/ephy-node-db.h b/lib/ephy-node-db.h index e181356e8..84c3d9b8c 100644 --- a/lib/ephy-node-db.h +++ b/lib/ephy-node-db.h @@ -35,7 +35,7 @@ G_BEGIN_DECLS #define EPHY_NODE_DB_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EPHY_TYPE_NODE_DB, EphyNodeDbClass)) typedef struct _EphyNodeDb EphyNodeDb; -typedef struct EphyNodeDbPrivate EphyNodeDbPrivate; +typedef struct _EphyNodeDbPrivate EphyNodeDbPrivate; struct _EphyNodeDb { diff --git a/lib/ephy-node-filter.c b/lib/ephy-node-filter.c index 4cffc46c7..0457f30ca 100644 --- a/lib/ephy-node-filter.c +++ b/lib/ephy-node-filter.c @@ -41,12 +41,12 @@ enum #define EPHY_NODE_FILTER_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_NODE_FILTER, EphyNodeFilterPrivate)) -struct EphyNodeFilterPrivate +struct _EphyNodeFilterPrivate { GPtrArray *levels; }; -struct EphyNodeFilterExpression +struct _EphyNodeFilterExpression { EphyNodeFilterExpressionType type; diff --git a/lib/ephy-node-filter.h b/lib/ephy-node-filter.h index ee1d61097..ea0f625e2 100644 --- a/lib/ephy-node-filter.h +++ b/lib/ephy-node-filter.h @@ -35,7 +35,7 @@ G_BEGIN_DECLS #define EPHY_IS_NODE_FILTER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_NODE_FILTER)) #define EPHY_NODE_FILTER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EPHY_TYPE_NODE_FILTER, EphyNodeFilterClass)) -typedef struct EphyNodeFilterPrivate EphyNodeFilterPrivate; +typedef struct _EphyNodeFilterPrivate EphyNodeFilterPrivate; typedef struct { @@ -70,7 +70,7 @@ typedef enum EPHY_NODE_FILTER_EXPRESSION_INT_PROP_LESS_THAN /* args: int prop_id, int int */ } EphyNodeFilterExpressionType; -typedef struct EphyNodeFilterExpression EphyNodeFilterExpression; +typedef struct _EphyNodeFilterExpression EphyNodeFilterExpression; /* The filter starts iterating over all expressions at level 0, * if one of them is TRUE it continues to level 1, etc. diff --git a/lib/ephy-node.c b/lib/ephy-node.c index 1be64cb21..af264cbe6 100644 --- a/lib/ephy-node.c +++ b/lib/ephy-node.c @@ -54,7 +54,7 @@ typedef struct guint property_id; } EphyNodeChange; -struct EphyNode +struct _EphyNode { int ref_count; diff --git a/lib/ephy-node.h b/lib/ephy-node.h index 9bbe5343a..34ac0d2ec 100644 --- a/lib/ephy-node.h +++ b/lib/ephy-node.h @@ -32,7 +32,7 @@ G_BEGIN_DECLS #define EPHY_IS_NODE(o) (o != NULL) -typedef struct EphyNode EphyNode; +typedef struct _EphyNode EphyNode; typedef enum { diff --git a/lib/widgets/ephy-node-view.c b/lib/widgets/ephy-node-view.c index dfa6c88bc..b72c6fcb4 100644 --- a/lib/widgets/ephy-node-view.c +++ b/lib/widgets/ephy-node-view.c @@ -44,7 +44,7 @@ static void ephy_node_view_finalize (GObject *object); #define EPHY_NODE_VIEW_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_NODE_VIEW, EphyNodeViewPrivate)) -struct EphyNodeViewPrivate +struct _EphyNodeViewPrivate { EphyNode *root; diff --git a/lib/widgets/ephy-node-view.h b/lib/widgets/ephy-node-view.h index ea0dc9f43..d5a4590eb 100644 --- a/lib/widgets/ephy-node-view.h +++ b/lib/widgets/ephy-node-view.h @@ -36,7 +36,7 @@ G_BEGIN_DECLS #define EPHY_IS_NODE_VIEW_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_NODE_VIEW)) #define EPHY_NODE_VIEW_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EPHY_TYPE_NODE_VIEW, EphyNodeViewClass)) -typedef struct EphyNodeViewPrivate EphyNodeViewPrivate; +typedef struct _EphyNodeViewPrivate EphyNodeViewPrivate; typedef struct { diff --git a/lib/widgets/ephy-search-entry.c b/lib/widgets/ephy-search-entry.c index 3212ad767..a783f2ae3 100644 --- a/lib/widgets/ephy-search-entry.c +++ b/lib/widgets/ephy-search-entry.c @@ -31,7 +31,7 @@ static void ephy_search_entry_init (EphySearchEntry *entry); #define EPHY_SEARCH_ENTRY_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_SEARCH_ENTRY, EphySearchEntryPrivate)) -struct EphySearchEntryPrivate +struct _EphySearchEntryPrivate { gboolean clearing; diff --git a/lib/widgets/ephy-search-entry.h b/lib/widgets/ephy-search-entry.h index 5145b8b6c..d641ac043 100644 --- a/lib/widgets/ephy-search-entry.h +++ b/lib/widgets/ephy-search-entry.h @@ -32,7 +32,7 @@ G_BEGIN_DECLS #define EPHY_IS_SEARCH_ENTRY_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_SEARCH_ENTRY)) #define EPHY_SEARCH_ENTRY_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EPHY_TYPE_SEARCH_ENTRY, EphySearchEntryClass)) -typedef struct EphySearchEntryPrivate EphySearchEntryPrivate; +typedef struct _EphySearchEntryPrivate EphySearchEntryPrivate; typedef struct { diff --git a/lib/widgets/ephy-spinner.c b/lib/widgets/ephy-spinner.c index fc0fbcc7a..7172e62ab 100644 --- a/lib/widgets/ephy-spinner.c +++ b/lib/widgets/ephy-spinner.c @@ -453,7 +453,7 @@ ephy_spinner_cache_ref (void) #define EPHY_SPINNER_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_SPINNER, EphySpinnerDetails)) -struct EphySpinnerDetails +struct _EphySpinnerDetails { GtkIconTheme *icon_theme; EphySpinnerCache *cache; diff --git a/lib/widgets/ephy-spinner.h b/lib/widgets/ephy-spinner.h index faa0520f0..b99c12a49 100644 --- a/lib/widgets/ephy-spinner.h +++ b/lib/widgets/ephy-spinner.h @@ -40,11 +40,11 @@ G_BEGIN_DECLS #define EPHY_IS_SPINNER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_SPINNER)) #define EPHY_SPINNER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EPHY_TYPE_SPINNER, EphySpinnerClass)) -typedef struct EphySpinner EphySpinner; -typedef struct EphySpinnerClass EphySpinnerClass; -typedef struct EphySpinnerDetails EphySpinnerDetails; +typedef struct _EphySpinner EphySpinner; +typedef struct _EphySpinnerClass EphySpinnerClass; +typedef struct _EphySpinnerDetails EphySpinnerDetails; -struct EphySpinner +struct _EphySpinner { GtkEventBox parent; @@ -52,7 +52,7 @@ struct EphySpinner EphySpinnerDetails *details; }; -struct EphySpinnerClass +struct _EphySpinnerClass { GtkEventBoxClass parent_class; }; diff --git a/lib/widgets/ephy-tree-model-node.c b/lib/widgets/ephy-tree-model-node.c index 487c9aa38..13ed2dbc8 100644 --- a/lib/widgets/ephy-tree-model-node.c +++ b/lib/widgets/ephy-tree-model-node.c @@ -36,7 +36,7 @@ static void ephy_tree_model_node_tree_model_init (GtkTreeModelIface *iface); #define EPHY_TREE_MODEL_NODE_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_TREE_MODEL_NODE, EphyTreeModelNodePrivate)) -struct EphyTreeModelNodePrivate +struct _EphyTreeModelNodePrivate { EphyNode *root; diff --git a/lib/widgets/ephy-tree-model-node.h b/lib/widgets/ephy-tree-model-node.h index 3e32288be..56bdd36a4 100644 --- a/lib/widgets/ephy-tree-model-node.h +++ b/lib/widgets/ephy-tree-model-node.h @@ -36,7 +36,7 @@ G_BEGIN_DECLS typedef void (*EphyTreeModelNodeValueFunc) (EphyNode *node, GValue *value, gpointer user_data); -typedef struct EphyTreeModelNodePrivate EphyTreeModelNodePrivate; +typedef struct _EphyTreeModelNodePrivate EphyTreeModelNodePrivate; typedef struct { diff --git a/lib/widgets/ephy-tree-model-sort.c b/lib/widgets/ephy-tree-model-sort.c index d088f524f..c20af59d0 100644 --- a/lib/widgets/ephy-tree-model-sort.c +++ b/lib/widgets/ephy-tree-model-sort.c @@ -45,7 +45,7 @@ static gboolean ephy_tree_model_sort_multi_drag_data_delete (EggTreeMultiDragSou #define EPHY_TREE_MODEL_SORT_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_TREE_MODEL_SORT, EphyTreeModelSortPrivate)) -struct EphyTreeModelSortPrivate +struct _EphyTreeModelSortPrivate { char *str_list; int drag_column_id; diff --git a/lib/widgets/ephy-tree-model-sort.h b/lib/widgets/ephy-tree-model-sort.h index f8c27cd16..c24fc214b 100644 --- a/lib/widgets/ephy-tree-model-sort.h +++ b/lib/widgets/ephy-tree-model-sort.h @@ -33,7 +33,7 @@ G_BEGIN_DECLS #define EPHY_IS_TREE_MODEL_SORT_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_TREE_MODEL_SORT)) #define EPHY_TREE_MODEL_SORT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EPHY_TYPE_TREE_MODEL_SORT, EphyTreeModelSortClass)) -typedef struct EphyTreeModelSortPrivate EphyTreeModelSortPrivate; +typedef struct _EphyTreeModelSortPrivate EphyTreeModelSortPrivate; typedef struct { diff --git a/lib/widgets/ephy-zoom-action.c b/lib/widgets/ephy-zoom-action.c index b23a0b379..ac547ac63 100644 --- a/lib/widgets/ephy-zoom-action.c +++ b/lib/widgets/ephy-zoom-action.c @@ -34,7 +34,7 @@ #define EPHY_ZOOM_ACTION_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_ZOOM_ACTION, EphyZoomActionPrivate)) -struct EphyZoomActionPrivate +struct _EphyZoomActionPrivate { float zoom; }; diff --git a/lib/widgets/ephy-zoom-action.h b/lib/widgets/ephy-zoom-action.h index 52a70e3fa..77f9b4150 100644 --- a/lib/widgets/ephy-zoom-action.h +++ b/lib/widgets/ephy-zoom-action.h @@ -33,11 +33,11 @@ G_BEGIN_DECLS #define EPHY_IS_ZOOM_ACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), EPHY_TYPE_ZOOM_ACTION)) #define EPHY_ZOOM_ACTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), EPHY_TYPE_ZOOM_ACTION, EphyZoomActionClass)) -typedef struct EphyZoomAction EphyZoomAction; -typedef struct EphyZoomActionClass EphyZoomActionClass; -typedef struct EphyZoomActionPrivate EphyZoomActionPrivate; +typedef struct _EphyZoomAction EphyZoomAction; +typedef struct _EphyZoomActionClass EphyZoomActionClass; +typedef struct _EphyZoomActionPrivate EphyZoomActionPrivate; -struct EphyZoomAction +struct _EphyZoomAction { GtkAction parent; @@ -45,7 +45,7 @@ struct EphyZoomAction EphyZoomActionPrivate *priv; }; -struct EphyZoomActionClass +struct _EphyZoomActionClass { GtkActionClass parent_class; |