aboutsummaryrefslogtreecommitdiffstats
path: root/e-util
diff options
context:
space:
mode:
Diffstat (limited to 'e-util')
-rw-r--r--e-util/e-alert-sink.c12
-rw-r--r--e-util/e-attachment-bar.c24
-rw-r--r--e-util/e-attachment-icon-view.c36
-rw-r--r--e-util/e-attachment-paned.c24
-rw-r--r--e-util/e-attachment-tree-view.c36
-rw-r--r--e-util/e-attachment-view.c114
-rw-r--r--e-util/e-data-capture.c8
-rw-r--r--e-util/e-focus-tracker.c18
-rw-r--r--e-util/e-mail-signature-editor.c6
-rw-r--r--e-util/e-photo-source.c18
-rw-r--r--e-util/e-popup-action.c8
-rw-r--r--e-util/e-preview-pane.c6
-rw-r--r--e-util/e-selectable.c70
-rw-r--r--e-util/e-sorter-array.c14
-rw-r--r--e-util/e-sorter.c42
-rw-r--r--e-util/e-source-config-dialog.c6
-rw-r--r--e-util/e-table-model.c128
-rw-r--r--e-util/e-table-one.c28
-rw-r--r--e-util/e-table-sorter.c14
-rw-r--r--e-util/e-table-specification.c6
-rw-r--r--e-util/e-table-subset.c30
-rw-r--r--e-util/e-tree-model.c176
-rw-r--r--e-util/e-tree-table-adapter.c30
-rw-r--r--e-util/e-web-view-gtkhtml.c20
-rw-r--r--e-util/e-web-view.c20
-rw-r--r--e-util/evolution-source-viewer.c6
26 files changed, 450 insertions, 450 deletions
diff --git a/e-util/e-alert-sink.c b/e-util/e-alert-sink.c
index ff94dee834..e545a7ce01 100644
--- a/e-util/e-alert-sink.c
+++ b/e-util/e-alert-sink.c
@@ -62,9 +62,9 @@ alert_sink_submit_alert (EAlertSink *alert_sink,
}
static void
-e_alert_sink_default_init (EAlertSinkInterface *interface)
+e_alert_sink_default_init (EAlertSinkInterface *iface)
{
- interface->submit_alert = alert_sink_submit_alert;
+ iface->submit_alert = alert_sink_submit_alert;
}
/**
@@ -80,13 +80,13 @@ void
e_alert_sink_submit_alert (EAlertSink *alert_sink,
EAlert *alert)
{
- EAlertSinkInterface *interface;
+ EAlertSinkInterface *iface;
g_return_if_fail (E_IS_ALERT_SINK (alert_sink));
g_return_if_fail (E_IS_ALERT (alert));
- interface = E_ALERT_SINK_GET_INTERFACE (alert_sink);
- g_return_if_fail (interface->submit_alert != NULL);
+ iface = E_ALERT_SINK_GET_INTERFACE (alert_sink);
+ g_return_if_fail (iface->submit_alert != NULL);
- interface->submit_alert (alert_sink, alert);
+ iface->submit_alert (alert_sink, alert);
}
diff --git a/e-util/e-attachment-bar.c b/e-util/e-attachment-bar.c
index 21075d15f3..3a14ba76b8 100644
--- a/e-util/e-attachment-bar.c
+++ b/e-util/e-attachment-bar.c
@@ -65,7 +65,7 @@ enum {
/* Forward Declarations */
static void e_attachment_bar_interface_init
- (EAttachmentViewInterface *interface);
+ (EAttachmentViewInterface *iface);
G_DEFINE_TYPE_WITH_CODE (
EAttachmentBar,
@@ -537,18 +537,18 @@ e_attachment_bar_class_init (EAttachmentBarClass *class)
}
static void
-e_attachment_bar_interface_init (EAttachmentViewInterface *interface)
+e_attachment_bar_interface_init (EAttachmentViewInterface *iface)
{
- interface->get_private = attachment_bar_get_private;
- interface->get_store = attachment_bar_get_store;
- interface->get_path_at_pos = attachment_bar_get_path_at_pos;
- interface->get_selected_paths = attachment_bar_get_selected_paths;
- interface->path_is_selected = attachment_bar_path_is_selected;
- interface->select_path = attachment_bar_select_path;
- interface->unselect_path = attachment_bar_unselect_path;
- interface->select_all = attachment_bar_select_all;
- interface->unselect_all = attachment_bar_unselect_all;
- interface->update_actions = attachment_bar_update_actions;
+ iface->get_private = attachment_bar_get_private;
+ iface->get_store = attachment_bar_get_store;
+ iface->get_path_at_pos = attachment_bar_get_path_at_pos;
+ iface->get_selected_paths = attachment_bar_get_selected_paths;
+ iface->path_is_selected = attachment_bar_path_is_selected;
+ iface->select_path = attachment_bar_select_path;
+ iface->unselect_path = attachment_bar_unselect_path;
+ iface->select_all = attachment_bar_select_all;
+ iface->unselect_all = attachment_bar_unselect_all;
+ iface->update_actions = attachment_bar_update_actions;
}
static void
diff --git a/e-util/e-attachment-icon-view.c b/e-util/e-attachment-icon-view.c
index 363844cd9d..0befff00ae 100644
--- a/e-util/e-attachment-icon-view.c
+++ b/e-util/e-attachment-icon-view.c
@@ -49,7 +49,7 @@ static gint icon_size = GTK_ICON_SIZE_DIALOG;
/* Forward Declarations */
static void e_attachment_icon_view_interface_init
- (EAttachmentViewInterface *interface);
+ (EAttachmentViewInterface *iface);
G_DEFINE_TYPE_WITH_CODE (
EAttachmentIconView,
@@ -543,23 +543,23 @@ e_attachment_icon_view_init (EAttachmentIconView *icon_view)
}
static void
-e_attachment_icon_view_interface_init (EAttachmentViewInterface *interface)
-{
- interface->get_private = attachment_icon_view_get_private;
- interface->get_store = attachment_icon_view_get_store;
-
- interface->get_path_at_pos = attachment_icon_view_get_path_at_pos;
- interface->get_selected_paths = attachment_icon_view_get_selected_paths;
- interface->path_is_selected = attachment_icon_view_path_is_selected;
- interface->select_path = attachment_icon_view_select_path;
- interface->unselect_path = attachment_icon_view_unselect_path;
- interface->select_all = attachment_icon_view_select_all;
- interface->unselect_all = attachment_icon_view_unselect_all;
-
- interface->drag_source_set = attachment_icon_view_drag_source_set;
- interface->drag_dest_set = attachment_icon_view_drag_dest_set;
- interface->drag_source_unset = attachment_icon_view_drag_source_unset;
- interface->drag_dest_unset = attachment_icon_view_drag_dest_unset;
+e_attachment_icon_view_interface_init (EAttachmentViewInterface *iface)
+{
+ iface->get_private = attachment_icon_view_get_private;
+ iface->get_store = attachment_icon_view_get_store;
+
+ iface->get_path_at_pos = attachment_icon_view_get_path_at_pos;
+ iface->get_selected_paths = attachment_icon_view_get_selected_paths;
+ iface->path_is_selected = attachment_icon_view_path_is_selected;
+ iface->select_path = attachment_icon_view_select_path;
+ iface->unselect_path = attachment_icon_view_unselect_path;
+ iface->select_all = attachment_icon_view_select_all;
+ iface->unselect_all = attachment_icon_view_unselect_all;
+
+ iface->drag_source_set = attachment_icon_view_drag_source_set;
+ iface->drag_dest_set = attachment_icon_view_drag_dest_set;
+ iface->drag_source_unset = attachment_icon_view_drag_source_unset;
+ iface->drag_dest_unset = attachment_icon_view_drag_dest_unset;
}
GtkWidget *
diff --git a/e-util/e-attachment-paned.c b/e-util/e-attachment-paned.c
index e94763fb3c..98772db873 100644
--- a/e-util/e-attachment-paned.c
+++ b/e-util/e-attachment-paned.c
@@ -69,7 +69,7 @@ enum {
/* Forward Declarations */
static void e_attachment_paned_interface_init
- (EAttachmentViewInterface *interface);
+ (EAttachmentViewInterface *iface);
G_DEFINE_TYPE_WITH_CODE (
EAttachmentPaned,
@@ -760,18 +760,18 @@ e_attachment_paned_init (EAttachmentPaned *paned)
}
static void
-e_attachment_paned_interface_init (EAttachmentViewInterface *interface)
+e_attachment_paned_interface_init (EAttachmentViewInterface *iface)
{
- interface->get_private = attachment_paned_get_private;
- interface->get_store = attachment_paned_get_store;
- interface->get_path_at_pos = attachment_paned_get_path_at_pos;
- interface->get_selected_paths = attachment_paned_get_selected_paths;
- interface->path_is_selected = attachment_paned_path_is_selected;
- interface->select_path = attachment_paned_select_path;
- interface->unselect_path = attachment_paned_unselect_path;
- interface->select_all = attachment_paned_select_all;
- interface->unselect_all = attachment_paned_unselect_all;
- interface->update_actions = attachment_paned_update_actions;
+ iface->get_private = attachment_paned_get_private;
+ iface->get_store = attachment_paned_get_store;
+ iface->get_path_at_pos = attachment_paned_get_path_at_pos;
+ iface->get_selected_paths = attachment_paned_get_selected_paths;
+ iface->path_is_selected = attachment_paned_path_is_selected;
+ iface->select_path = attachment_paned_select_path;
+ iface->unselect_path = attachment_paned_unselect_path;
+ iface->select_all = attachment_paned_select_all;
+ iface->unselect_all = attachment_paned_unselect_all;
+ iface->update_actions = attachment_paned_update_actions;
}
GtkWidget *
diff --git a/e-util/e-attachment-tree-view.c b/e-util/e-attachment-tree-view.c
index d6dc59eada..399b1c7ea8 100644
--- a/e-util/e-attachment-tree-view.c
+++ b/e-util/e-attachment-tree-view.c
@@ -47,7 +47,7 @@ enum {
/* Forward Declarations */
static void e_attachment_tree_view_interface_init
- (EAttachmentViewInterface *interface);
+ (EAttachmentViewInterface *iface);
G_DEFINE_TYPE_WITH_CODE (
EAttachmentTreeView,
@@ -596,23 +596,23 @@ e_attachment_tree_view_init (EAttachmentTreeView *tree_view)
}
static void
-e_attachment_tree_view_interface_init (EAttachmentViewInterface *interface)
-{
- interface->get_private = attachment_tree_view_get_private;
- interface->get_store = attachment_tree_view_get_store;
-
- interface->get_path_at_pos = attachment_tree_view_get_path_at_pos;
- interface->get_selected_paths = attachment_tree_view_get_selected_paths;
- interface->path_is_selected = attachment_tree_view_path_is_selected;
- interface->select_path = attachment_tree_view_select_path;
- interface->unselect_path = attachment_tree_view_unselect_path;
- interface->select_all = attachment_tree_view_select_all;
- interface->unselect_all = attachment_tree_view_unselect_all;
-
- interface->drag_source_set = attachment_tree_view_drag_source_set;
- interface->drag_dest_set = attachment_tree_view_drag_dest_set;
- interface->drag_source_unset = attachment_tree_view_drag_source_unset;
- interface->drag_dest_unset = attachment_tree_view_drag_dest_unset;
+e_attachment_tree_view_interface_init (EAttachmentViewInterface *iface)
+{
+ iface->get_private = attachment_tree_view_get_private;
+ iface->get_store = attachment_tree_view_get_store;
+
+ iface->get_path_at_pos = attachment_tree_view_get_path_at_pos;
+ iface->get_selected_paths = attachment_tree_view_get_selected_paths;
+ iface->path_is_selected = attachment_tree_view_path_is_selected;
+ iface->select_path = attachment_tree_view_select_path;
+ iface->unselect_path = attachment_tree_view_unselect_path;
+ iface->select_all = attachment_tree_view_select_all;
+ iface->unselect_all = attachment_tree_view_unselect_all;
+
+ iface->drag_source_set = attachment_tree_view_drag_source_set;
+ iface->drag_dest_set = attachment_tree_view_drag_dest_set;
+ iface->drag_source_unset = attachment_tree_view_drag_source_unset;
+ iface->drag_dest_unset = attachment_tree_view_drag_dest_unset;
}
GtkWidget *
diff --git a/e-util/e-attachment-view.c b/e-util/e-attachment-view.c
index dbfe804110..704c0e239f 100644
--- a/e-util/e-attachment-view.c
+++ b/e-util/e-attachment-view.c
@@ -843,12 +843,12 @@ attachment_view_init_drag_dest (EAttachmentView *view)
}
static void
-e_attachment_view_default_init (EAttachmentViewInterface *interface)
+e_attachment_view_default_init (EAttachmentViewInterface *iface)
{
- interface->update_actions = attachment_view_update_actions;
+ iface->update_actions = attachment_view_update_actions;
g_object_interface_install_property (
- interface,
+ iface,
g_param_spec_boolean (
"dragging",
"Dragging",
@@ -857,7 +857,7 @@ e_attachment_view_default_init (EAttachmentViewInterface *interface)
G_PARAM_READWRITE));
g_object_interface_install_property (
- interface,
+ iface,
g_param_spec_boolean (
"editable",
"Editable",
@@ -868,7 +868,7 @@ e_attachment_view_default_init (EAttachmentViewInterface *interface)
signals[UPDATE_ACTIONS] = g_signal_new (
"update-actions",
- G_TYPE_FROM_INTERFACE (interface),
+ G_TYPE_FROM_INTERFACE (iface),
G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
G_STRUCT_OFFSET (EAttachmentViewInterface, update_actions),
NULL, NULL,
@@ -984,27 +984,27 @@ e_attachment_view_finalize (EAttachmentView *view)
EAttachmentViewPrivate *
e_attachment_view_get_private (EAttachmentView *view)
{
- EAttachmentViewInterface *interface;
+ EAttachmentViewInterface *iface;
g_return_val_if_fail (E_IS_ATTACHMENT_VIEW (view), NULL);
- interface = E_ATTACHMENT_VIEW_GET_INTERFACE (view);
- g_return_val_if_fail (interface->get_private != NULL, NULL);
+ iface = E_ATTACHMENT_VIEW_GET_INTERFACE (view);
+ g_return_val_if_fail (iface->get_private != NULL, NULL);
- return interface->get_private (view);
+ return iface->get_private (view);
}
EAttachmentStore *
e_attachment_view_get_store (EAttachmentView *view)
{
- EAttachmentViewInterface *interface;
+ EAttachmentViewInterface *iface;
g_return_val_if_fail (E_IS_ATTACHMENT_VIEW (view), NULL);
- interface = E_ATTACHMENT_VIEW_GET_INTERFACE (view);
- g_return_val_if_fail (interface->get_store != NULL, NULL);
+ iface = E_ATTACHMENT_VIEW_GET_INTERFACE (view);
+ g_return_val_if_fail (iface->get_store != NULL, NULL);
- return interface->get_store (view);
+ return iface->get_store (view);
}
gboolean
@@ -1385,34 +1385,34 @@ e_attachment_view_get_path_at_pos (EAttachmentView *view,
gint x,
gint y)
{
- EAttachmentViewInterface *interface;
+ EAttachmentViewInterface *iface;
g_return_val_if_fail (E_IS_ATTACHMENT_VIEW (view), NULL);
- interface = E_ATTACHMENT_VIEW_GET_INTERFACE (view);
- g_return_val_if_fail (interface->get_path_at_pos != NULL, NULL);
+ iface = E_ATTACHMENT_VIEW_GET_INTERFACE (view);
+ g_return_val_if_fail (iface->get_path_at_pos != NULL, NULL);
- return interface->get_path_at_pos (view, x, y);
+ return iface->get_path_at_pos (view, x, y);
}
GList *
e_attachment_view_get_selected_paths (EAttachmentView *view)
{
- EAttachmentViewInterface *interface;
+ EAttachmentViewInterface *iface;
g_return_val_if_fail (E_IS_ATTACHMENT_VIEW (view), NULL);
- interface = E_ATTACHMENT_VIEW_GET_INTERFACE (view);
- g_return_val_if_fail (interface->get_selected_paths != NULL, NULL);
+ iface = E_ATTACHMENT_VIEW_GET_INTERFACE (view);
+ g_return_val_if_fail (iface->get_selected_paths != NULL, NULL);
- return interface->get_selected_paths (view);
+ return iface->get_selected_paths (view);
}
gboolean
e_attachment_view_path_is_selected (EAttachmentView *view,
GtkTreePath *path)
{
- EAttachmentViewInterface *interface;
+ EAttachmentViewInterface *iface;
g_return_val_if_fail (E_IS_ATTACHMENT_VIEW (view), FALSE);
@@ -1420,66 +1420,66 @@ e_attachment_view_path_is_selected (EAttachmentView *view,
if (path == NULL)
return FALSE;
- interface = E_ATTACHMENT_VIEW_GET_INTERFACE (view);
- g_return_val_if_fail (interface->path_is_selected != NULL, FALSE);
+ iface = E_ATTACHMENT_VIEW_GET_INTERFACE (view);
+ g_return_val_if_fail (iface->path_is_selected != NULL, FALSE);
- return interface->path_is_selected (view, path);
+ return iface->path_is_selected (view, path);
}
void
e_attachment_view_select_path (EAttachmentView *view,
GtkTreePath *path)
{
- EAttachmentViewInterface *interface;
+ EAttachmentViewInterface *iface;
g_return_if_fail (E_IS_ATTACHMENT_VIEW (view));
g_return_if_fail (path != NULL);
- interface = E_ATTACHMENT_VIEW_GET_INTERFACE (view);
- g_return_if_fail (interface->select_path != NULL);
+ iface = E_ATTACHMENT_VIEW_GET_INTERFACE (view);
+ g_return_if_fail (iface->select_path != NULL);
- interface->select_path (view, path);
+ iface->select_path (view, path);
}
void
e_attachment_view_unselect_path (EAttachmentView *view,
GtkTreePath *path)
{
- EAttachmentViewInterface *interface;
+ EAttachmentViewInterface *iface;
g_return_if_fail (E_IS_ATTACHMENT_VIEW (view));
g_return_if_fail (path != NULL);
- interface = E_ATTACHMENT_VIEW_GET_INTERFACE (view);
- g_return_if_fail (interface->unselect_path != NULL);
+ iface = E_ATTACHMENT_VIEW_GET_INTERFACE (view);
+ g_return_if_fail (iface->unselect_path != NULL);
- interface->unselect_path (view, path);
+ iface->unselect_path (view, path);
}
void
e_attachment_view_select_all (EAttachmentView *view)
{
- EAttachmentViewInterface *interface;
+ EAttachmentViewInterface *iface;
g_return_if_fail (E_IS_ATTACHMENT_VIEW (view));
- interface = E_ATTACHMENT_VIEW_GET_INTERFACE (view);
- g_return_if_fail (interface->select_all != NULL);
+ iface = E_ATTACHMENT_VIEW_GET_INTERFACE (view);
+ g_return_if_fail (iface->select_all != NULL);
- interface->select_all (view);
+ iface->select_all (view);
}
void
e_attachment_view_unselect_all (EAttachmentView *view)
{
- EAttachmentViewInterface *interface;
+ EAttachmentViewInterface *iface;
g_return_if_fail (E_IS_ATTACHMENT_VIEW (view));
- interface = E_ATTACHMENT_VIEW_GET_INTERFACE (view);
- g_return_if_fail (interface->unselect_all != NULL);
+ iface = E_ATTACHMENT_VIEW_GET_INTERFACE (view);
+ g_return_if_fail (iface->unselect_all != NULL);
- interface->unselect_all (view);
+ iface->unselect_all (view);
}
void
@@ -1504,22 +1504,22 @@ e_attachment_view_sync_selection (EAttachmentView *view,
void
e_attachment_view_drag_source_set (EAttachmentView *view)
{
- EAttachmentViewInterface *interface;
+ EAttachmentViewInterface *iface;
GtkTargetEntry *targets;
GtkTargetList *list;
gint n_targets;
g_return_if_fail (E_IS_ATTACHMENT_VIEW (view));
- interface = E_ATTACHMENT_VIEW_GET_INTERFACE (view);
- if (interface->drag_source_set == NULL)
+ iface = E_ATTACHMENT_VIEW_GET_INTERFACE (view);
+ if (iface->drag_source_set == NULL)
return;
list = gtk_target_list_new (NULL, 0);
gtk_target_list_add_uri_targets (list, 0);
targets = gtk_target_table_new_from_list (list, &n_targets);
- interface->drag_source_set (
+ iface->drag_source_set (
view, GDK_BUTTON1_MASK,
targets, n_targets, GDK_ACTION_COPY);
@@ -1530,15 +1530,15 @@ e_attachment_view_drag_source_set (EAttachmentView *view)
void
e_attachment_view_drag_source_unset (EAttachmentView *view)
{
- EAttachmentViewInterface *interface;
+ EAttachmentViewInterface *iface;
g_return_if_fail (E_IS_ATTACHMENT_VIEW (view));
- interface = E_ATTACHMENT_VIEW_GET_INTERFACE (view);
- if (interface->drag_source_unset == NULL)
+ iface = E_ATTACHMENT_VIEW_GET_INTERFACE (view);
+ if (iface->drag_source_unset == NULL)
return;
- interface->drag_source_unset (view);
+ iface->drag_source_unset (view);
}
void
@@ -1683,14 +1683,14 @@ void
e_attachment_view_drag_dest_set (EAttachmentView *view)
{
EAttachmentViewPrivate *priv;
- EAttachmentViewInterface *interface;
+ EAttachmentViewInterface *iface;
GtkTargetEntry *targets;
gint n_targets;
g_return_if_fail (E_IS_ATTACHMENT_VIEW (view));
- interface = E_ATTACHMENT_VIEW_GET_INTERFACE (view);
- if (interface->drag_dest_set == NULL)
+ iface = E_ATTACHMENT_VIEW_GET_INTERFACE (view);
+ if (iface->drag_dest_set == NULL)
return;
priv = e_attachment_view_get_private (view);
@@ -1698,7 +1698,7 @@ e_attachment_view_drag_dest_set (EAttachmentView *view)
targets = gtk_target_table_new_from_list (
priv->target_list, &n_targets);
- interface->drag_dest_set (
+ iface->drag_dest_set (
view, targets, n_targets, priv->drag_actions);
gtk_target_table_free (targets, n_targets);
@@ -1707,15 +1707,15 @@ e_attachment_view_drag_dest_set (EAttachmentView *view)
void
e_attachment_view_drag_dest_unset (EAttachmentView *view)
{
- EAttachmentViewInterface *interface;
+ EAttachmentViewInterface *iface;
g_return_if_fail (E_IS_ATTACHMENT_VIEW (view));
- interface = E_ATTACHMENT_VIEW_GET_INTERFACE (view);
- if (interface->drag_dest_unset == NULL)
+ iface = E_ATTACHMENT_VIEW_GET_INTERFACE (view);
+ if (iface->drag_dest_unset == NULL)
return;
- interface->drag_dest_unset (view);
+ iface->drag_dest_unset (view);
}
gboolean
diff --git a/e-util/e-data-capture.c b/e-util/e-data-capture.c
index e0413a029f..f51e682f07 100644
--- a/e-util/e-data-capture.c
+++ b/e-util/e-data-capture.c
@@ -63,7 +63,7 @@ enum {
static guint signals[LAST_SIGNAL];
/* Forward Declarations */
-static void e_data_capture_converter_init (GConverterIface *interface);
+static void e_data_capture_converter_init (GConverterIface *iface);
G_DEFINE_TYPE_WITH_CODE (
EDataCapture,
@@ -303,10 +303,10 @@ e_data_capture_class_init (EDataCaptureClass *class)
}
static void
-e_data_capture_converter_init (GConverterIface *interface)
+e_data_capture_converter_init (GConverterIface *iface)
{
- interface->convert = data_capture_convert;
- interface->reset = data_capture_reset;
+ iface->convert = data_capture_convert;
+ iface->reset = data_capture_reset;
}
static void
diff --git a/e-util/e-focus-tracker.c b/e-util/e-focus-tracker.c
index 18f4327f07..42cd634202 100644
--- a/e-util/e-focus-tracker.c
+++ b/e-util/e-focus-tracker.c
@@ -261,10 +261,10 @@ focus_tracker_selectable_update_actions (EFocusTracker *focus_tracker,
GdkAtom *targets,
gint n_targets)
{
- ESelectableInterface *interface;
+ ESelectableInterface *iface;
GtkAction *action;
- interface = E_SELECTABLE_GET_INTERFACE (selectable);
+ iface = E_SELECTABLE_GET_INTERFACE (selectable);
e_selectable_update_actions (
selectable, focus_tracker, targets, n_targets);
@@ -276,31 +276,31 @@ focus_tracker_selectable_update_actions (EFocusTracker *focus_tracker,
* ESelectable implementations. */
action = e_focus_tracker_get_cut_clipboard_action (focus_tracker);
- if (action != NULL && interface->cut_clipboard == NULL)
+ if (action != NULL && iface->cut_clipboard == NULL)
gtk_action_set_sensitive (action, FALSE);
action = e_focus_tracker_get_copy_clipboard_action (focus_tracker);
- if (action != NULL && interface->copy_clipboard == NULL)
+ if (action != NULL && iface->copy_clipboard == NULL)
gtk_action_set_sensitive (action, FALSE);
action = e_focus_tracker_get_paste_clipboard_action (focus_tracker);
- if (action != NULL && interface->paste_clipboard == NULL)
+ if (action != NULL && iface->paste_clipboard == NULL)
gtk_action_set_sensitive (action, FALSE);
action = e_focus_tracker_get_delete_selection_action (focus_tracker);
- if (action != NULL && interface->delete_selection == NULL)
+ if (action != NULL && iface->delete_selection == NULL)
gtk_action_set_sensitive (action, FALSE);
action = e_focus_tracker_get_select_all_action (focus_tracker);
- if (action != NULL && interface->select_all == NULL)
+ if (action != NULL && iface->select_all == NULL)
gtk_action_set_sensitive (action, FALSE);
action = e_focus_tracker_get_undo_action (focus_tracker);
- if (action != NULL && interface->undo == NULL)
+ if (action != NULL && iface->undo == NULL)
gtk_action_set_sensitive (action, FALSE);
action = e_focus_tracker_get_redo_action (focus_tracker);
- if (action != NULL && interface->redo == NULL)
+ if (action != NULL && iface->redo == NULL)
gtk_action_set_sensitive (action, FALSE);
}
diff --git a/e-util/e-mail-signature-editor.c b/e-util/e-mail-signature-editor.c
index bb3e1dee36..05c783d448 100644
--- a/e-util/e-mail-signature-editor.c
+++ b/e-util/e-mail-signature-editor.c
@@ -77,7 +77,7 @@ static const gchar *ui =
/* Forward Declarations */
static void e_mail_signature_editor_alert_sink_init
- (EAlertSinkInterface *interface);
+ (EAlertSinkInterface *iface);
G_DEFINE_TYPE_WITH_CODE (
EMailSignatureEditor,
@@ -742,9 +742,9 @@ e_mail_signature_editor_class_init (EMailSignatureEditorClass *class)
}
static void
-e_mail_signature_editor_alert_sink_init (EAlertSinkInterface *interface)
+e_mail_signature_editor_alert_sink_init (EAlertSinkInterface *iface)
{
- interface->submit_alert = mail_signature_editor_submit_alert;
+ iface->submit_alert = mail_signature_editor_submit_alert;
}
static void
diff --git a/e-util/e-photo-source.c b/e-util/e-photo-source.c
index 67deb6f1e6..56f3e427bd 100644
--- a/e-util/e-photo-source.c
+++ b/e-util/e-photo-source.c
@@ -36,7 +36,7 @@ G_DEFINE_INTERFACE (
G_TYPE_OBJECT)
static void
-e_photo_source_default_init (EPhotoSourceInterface *interface)
+e_photo_source_default_init (EPhotoSourceInterface *iface)
{
}
@@ -60,15 +60,15 @@ e_photo_source_get_photo (EPhotoSource *photo_source,
GAsyncReadyCallback callback,
gpointer user_data)
{
- EPhotoSourceInterface *interface;
+ EPhotoSourceInterface *iface;
g_return_if_fail (E_IS_PHOTO_SOURCE (photo_source));
g_return_if_fail (email_address != NULL);
- interface = E_PHOTO_SOURCE_GET_INTERFACE (photo_source);
- g_return_if_fail (interface->get_photo != NULL);
+ iface = E_PHOTO_SOURCE_GET_INTERFACE (photo_source);
+ g_return_if_fail (iface->get_photo != NULL);
- interface->get_photo (
+ iface->get_photo (
photo_source, email_address,
cancellable, callback, user_data);
}
@@ -107,16 +107,16 @@ e_photo_source_get_photo_finish (EPhotoSource *photo_source,
gint *out_priority,
GError **error)
{
- EPhotoSourceInterface *interface;
+ EPhotoSourceInterface *iface;
g_return_val_if_fail (E_IS_PHOTO_SOURCE (photo_source), FALSE);
g_return_val_if_fail (G_IS_ASYNC_RESULT (result), FALSE);
g_return_val_if_fail (out_stream != NULL, FALSE);
- interface = E_PHOTO_SOURCE_GET_INTERFACE (photo_source);
- g_return_val_if_fail (interface->get_photo_finish != NULL, FALSE);
+ iface = E_PHOTO_SOURCE_GET_INTERFACE (photo_source);
+ g_return_val_if_fail (iface->get_photo_finish != NULL, FALSE);
- return interface->get_photo_finish (
+ return iface->get_photo_finish (
photo_source, result, out_stream, out_priority, error);
}
diff --git a/e-util/e-popup-action.c b/e-util/e-popup-action.c
index cb28369a87..9a3702b8d2 100644
--- a/e-util/e-popup-action.c
+++ b/e-util/e-popup-action.c
@@ -44,7 +44,7 @@ struct _EPopupActionPrivate {
};
/* Forward Declarations */
-static void e_popup_action_activatable_init (GtkActivatableIface *interface);
+static void e_popup_action_activatable_init (GtkActivatableIface *iface);
G_DEFINE_TYPE_WITH_CODE (
EPopupAction,
@@ -348,10 +348,10 @@ e_popup_action_init (EPopupAction *popup_action)
}
static void
-e_popup_action_activatable_init (GtkActivatableIface *interface)
+e_popup_action_activatable_init (GtkActivatableIface *iface)
{
- interface->update = popup_action_update;
- interface->sync_action_properties = popup_action_sync_action_properties;
+ iface->update = popup_action_update;
+ iface->sync_action_properties = popup_action_sync_action_properties;
}
EPopupAction *
diff --git a/e-util/e-preview-pane.c b/e-util/e-preview-pane.c
index 9cdac59039..22ca775efb 100644
--- a/e-util/e-preview-pane.c
+++ b/e-util/e-preview-pane.c
@@ -50,7 +50,7 @@ static guint signals[LAST_SIGNAL];
/* Forward Declarations */
static void e_preview_pane_alert_sink_init
- (EAlertSinkInterface *interface);
+ (EAlertSinkInterface *iface);
G_DEFINE_TYPE_WITH_CODE (
EPreviewPane,
@@ -273,9 +273,9 @@ e_preview_pane_class_init (EPreviewPaneClass *class)
}
static void
-e_preview_pane_alert_sink_init (EAlertSinkInterface *interface)
+e_preview_pane_alert_sink_init (EAlertSinkInterface *iface)
{
- interface->submit_alert = preview_pane_submit_alert;
+ iface->submit_alert = preview_pane_submit_alert;
}
static void
diff --git a/e-util/e-selectable.c b/e-util/e-selectable.c
index 6b011ee33b..5e3267cf2e 100644
--- a/e-util/e-selectable.c
+++ b/e-util/e-selectable.c
@@ -30,10 +30,10 @@ G_DEFINE_INTERFACE (
GTK_TYPE_WIDGET)
static void
-e_selectable_default_init (ESelectableInterface *interface)
+e_selectable_default_init (ESelectableInterface *iface)
{
g_object_interface_install_property (
- interface,
+ iface,
g_param_spec_boxed (
"copy-target-list",
"Copy Target List",
@@ -42,7 +42,7 @@ e_selectable_default_init (ESelectableInterface *interface)
G_PARAM_READABLE));
g_object_interface_install_property (
- interface,
+ iface,
g_param_spec_boxed (
"paste-target-list",
"Paste Target List",
@@ -57,14 +57,14 @@ e_selectable_update_actions (ESelectable *selectable,
GdkAtom *clipboard_targets,
gint n_clipboard_targets)
{
- ESelectableInterface *interface;
+ ESelectableInterface *iface;
g_return_if_fail (E_IS_SELECTABLE (selectable));
- interface = E_SELECTABLE_GET_INTERFACE (selectable);
- g_return_if_fail (interface->update_actions != NULL);
+ iface = E_SELECTABLE_GET_INTERFACE (selectable);
+ g_return_if_fail (iface->update_actions != NULL);
- interface->update_actions (
+ iface->update_actions (
selectable, focus_tracker,
clipboard_targets, n_clipboard_targets);
}
@@ -72,92 +72,92 @@ e_selectable_update_actions (ESelectable *selectable,
void
e_selectable_cut_clipboard (ESelectable *selectable)
{
- ESelectableInterface *interface;
+ ESelectableInterface *iface;
g_return_if_fail (E_IS_SELECTABLE (selectable));
- interface = E_SELECTABLE_GET_INTERFACE (selectable);
+ iface = E_SELECTABLE_GET_INTERFACE (selectable);
- if (interface->cut_clipboard != NULL)
- interface->cut_clipboard (selectable);
+ if (iface->cut_clipboard != NULL)
+ iface->cut_clipboard (selectable);
}
void
e_selectable_copy_clipboard (ESelectable *selectable)
{
- ESelectableInterface *interface;
+ ESelectableInterface *iface;
g_return_if_fail (E_IS_SELECTABLE (selectable));
- interface = E_SELECTABLE_GET_INTERFACE (selectable);
+ iface = E_SELECTABLE_GET_INTERFACE (selectable);
- if (interface->copy_clipboard != NULL)
- interface->copy_clipboard (selectable);
+ if (iface->copy_clipboard != NULL)
+ iface->copy_clipboard (selectable);
}
void
e_selectable_paste_clipboard (ESelectable *selectable)
{
- ESelectableInterface *interface;
+ ESelectableInterface *iface;
g_return_if_fail (E_IS_SELECTABLE (selectable));
- interface = E_SELECTABLE_GET_INTERFACE (selectable);
+ iface = E_SELECTABLE_GET_INTERFACE (selectable);
- if (interface->paste_clipboard != NULL)
- interface->paste_clipboard (selectable);
+ if (iface->paste_clipboard != NULL)
+ iface->paste_clipboard (selectable);
}
void
e_selectable_delete_selection (ESelectable *selectable)
{
- ESelectableInterface *interface;
+ ESelectableInterface *iface;
g_return_if_fail (E_IS_SELECTABLE (selectable));
- interface = E_SELECTABLE_GET_INTERFACE (selectable);
+ iface = E_SELECTABLE_GET_INTERFACE (selectable);
- if (interface->delete_selection != NULL)
- interface->delete_selection (selectable);
+ if (iface->delete_selection != NULL)
+ iface->delete_selection (selectable);
}
void
e_selectable_select_all (ESelectable *selectable)
{
- ESelectableInterface *interface;
+ ESelectableInterface *iface;
g_return_if_fail (E_IS_SELECTABLE (selectable));
- interface = E_SELECTABLE_GET_INTERFACE (selectable);
+ iface = E_SELECTABLE_GET_INTERFACE (selectable);
- if (interface->select_all != NULL)
- interface->select_all (selectable);
+ if (iface->select_all != NULL)
+ iface->select_all (selectable);
}
void
e_selectable_undo (ESelectable *selectable)
{
- ESelectableInterface *interface;
+ ESelectableInterface *iface;
g_return_if_fail (E_IS_SELECTABLE (selectable));
- interface = E_SELECTABLE_GET_INTERFACE (selectable);
+ iface = E_SELECTABLE_GET_INTERFACE (selectable);
- if (interface->undo != NULL)
- interface->undo (selectable);
+ if (iface->undo != NULL)
+ iface->undo (selectable);
}
void
e_selectable_redo (ESelectable *selectable)
{
- ESelectableInterface *interface;
+ ESelectableInterface *iface;
g_return_if_fail (E_IS_SELECTABLE (selectable));
- interface = E_SELECTABLE_GET_INTERFACE (selectable);
+ iface = E_SELECTABLE_GET_INTERFACE (selectable);
- if (interface->redo != NULL)
- interface->redo (selectable);
+ if (iface->redo != NULL)
+ iface->redo (selectable);
}
GtkTargetList *
diff --git a/e-util/e-sorter-array.c b/e-util/e-sorter-array.c
index c8a55c4a0f..f6109ce17f 100644
--- a/e-util/e-sorter-array.c
+++ b/e-util/e-sorter-array.c
@@ -22,7 +22,7 @@
#include "e-misc-utils.h"
/* Forward Declarations */
-static void e_sorter_array_interface_init (ESorterInterface *interface);
+static void e_sorter_array_interface_init (ESorterInterface *iface);
G_DEFINE_TYPE_WITH_CODE (
ESorterArray,
@@ -207,13 +207,13 @@ e_sorter_array_class_init (ESorterArrayClass *class)
}
static void
-e_sorter_array_interface_init (ESorterInterface *interface)
+e_sorter_array_interface_init (ESorterInterface *iface)
{
- interface->model_to_sorted = sorter_array_model_to_sorted;
- interface->sorted_to_model = sorter_array_sorted_to_model;
- interface->get_model_to_sorted_array = sorter_array_get_model_to_sorted_array;
- interface->get_sorted_to_model_array = sorter_array_get_sorted_to_model_array;
- interface->needs_sorting = sorter_array_needs_sorting;
+ iface->model_to_sorted = sorter_array_model_to_sorted;
+ iface->sorted_to_model = sorter_array_sorted_to_model;
+ iface->get_model_to_sorted_array = sorter_array_get_model_to_sorted_array;
+ iface->get_sorted_to_model_array = sorter_array_get_sorted_to_model_array;
+ iface->needs_sorting = sorter_array_needs_sorting;
}
static void
diff --git a/e-util/e-sorter.c b/e-util/e-sorter.c
index 0d706414b9..c2181c7544 100644
--- a/e-util/e-sorter.c
+++ b/e-util/e-sorter.c
@@ -20,7 +20,7 @@
G_DEFINE_INTERFACE (ESorter, e_sorter, G_TYPE_OBJECT)
static void
-e_sorter_default_init (ESorterInterface *interface)
+e_sorter_default_init (ESorterInterface *iface)
{
}
@@ -28,30 +28,30 @@ gint
e_sorter_model_to_sorted (ESorter *sorter,
gint row)
{
- ESorterInterface *interface;
+ ESorterInterface *iface;
g_return_val_if_fail (E_IS_SORTER (sorter), -1);
g_return_val_if_fail (row >= 0, -1);
- interface = E_SORTER_GET_INTERFACE (sorter);
- g_return_val_if_fail (interface->model_to_sorted != NULL, -1);
+ iface = E_SORTER_GET_INTERFACE (sorter);
+ g_return_val_if_fail (iface->model_to_sorted != NULL, -1);
- return interface->model_to_sorted (sorter, row);
+ return iface->model_to_sorted (sorter, row);
}
gint
e_sorter_sorted_to_model (ESorter *sorter,
gint row)
{
- ESorterInterface *interface;
+ ESorterInterface *iface;
g_return_val_if_fail (E_IS_SORTER (sorter), -1);
g_return_val_if_fail (row >= 0, -1);
- interface = E_SORTER_GET_INTERFACE (sorter);
- g_return_val_if_fail (interface->sorted_to_model != NULL, -1);
+ iface = E_SORTER_GET_INTERFACE (sorter);
+ g_return_val_if_fail (iface->sorted_to_model != NULL, -1);
- return interface->sorted_to_model (sorter, row);
+ return iface->sorted_to_model (sorter, row);
}
void
@@ -59,14 +59,14 @@ e_sorter_get_model_to_sorted_array (ESorter *sorter,
gint **array,
gint *count)
{
- ESorterInterface *interface;
+ ESorterInterface *iface;
g_return_if_fail (E_IS_SORTER (sorter));
- interface = E_SORTER_GET_INTERFACE (sorter);
- g_return_if_fail (interface->get_model_to_sorted_array != NULL);
+ iface = E_SORTER_GET_INTERFACE (sorter);
+ g_return_if_fail (iface->get_model_to_sorted_array != NULL);
- interface->get_model_to_sorted_array (sorter, array, count);
+ iface->get_model_to_sorted_array (sorter, array, count);
}
void
@@ -74,26 +74,26 @@ e_sorter_get_sorted_to_model_array (ESorter *sorter,
gint **array,
gint *count)
{
- ESorterInterface *interface;
+ ESorterInterface *iface;
g_return_if_fail (E_IS_SORTER (sorter));
- interface = E_SORTER_GET_INTERFACE (sorter);
- g_return_if_fail (interface->get_sorted_to_model_array != NULL);
+ iface = E_SORTER_GET_INTERFACE (sorter);
+ g_return_if_fail (iface->get_sorted_to_model_array != NULL);
- interface->get_sorted_to_model_array (sorter, array, count);
+ iface->get_sorted_to_model_array (sorter, array, count);
}
gboolean
e_sorter_needs_sorting (ESorter *sorter)
{
- ESorterInterface *interface;
+ ESorterInterface *iface;
g_return_val_if_fail (E_IS_SORTER (sorter), FALSE);
- interface = E_SORTER_GET_INTERFACE (sorter);
- g_return_val_if_fail (interface->needs_sorting != NULL, FALSE);
+ iface = E_SORTER_GET_INTERFACE (sorter);
+ g_return_val_if_fail (iface->needs_sorting != NULL, FALSE);
- return interface->needs_sorting (sorter);
+ return iface->needs_sorting (sorter);
}
diff --git a/e-util/e-source-config-dialog.c b/e-util/e-source-config-dialog.c
index 5c84bda2de..507f8c459b 100644
--- a/e-util/e-source-config-dialog.c
+++ b/e-util/e-source-config-dialog.c
@@ -46,7 +46,7 @@ enum {
/* Forward Declarations */
static void e_source_config_dialog_alert_sink_init
- (EAlertSinkInterface *interface);
+ (EAlertSinkInterface *iface);
G_DEFINE_TYPE_WITH_CODE (
ESourceConfigDialog,
@@ -360,9 +360,9 @@ e_source_config_dialog_class_init (ESourceConfigDialogClass *class)
}
static void
-e_source_config_dialog_alert_sink_init (EAlertSinkInterface *interface)
+e_source_config_dialog_alert_sink_init (EAlertSinkInterface *iface)
{
- interface->submit_alert = source_config_dialog_submit_alert;
+ iface->submit_alert = source_config_dialog_submit_alert;
}
static void
diff --git a/e-util/e-table-model.c b/e-util/e-table-model.c
index 26f4b42e34..7f59db9c31 100644
--- a/e-util/e-table-model.c
+++ b/e-util/e-table-model.c
@@ -48,11 +48,11 @@ table_model_is_frozen (ETableModel *table_model)
}
static void
-e_table_model_default_init (ETableModelInterface *interface)
+e_table_model_default_init (ETableModelInterface *iface)
{
signals[MODEL_NO_CHANGE] = g_signal_new (
"model_no_change",
- G_TYPE_FROM_INTERFACE (interface),
+ G_TYPE_FROM_INTERFACE (iface),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ETableModelInterface, model_no_change),
NULL, NULL, NULL,
@@ -60,7 +60,7 @@ e_table_model_default_init (ETableModelInterface *interface)
signals[MODEL_CHANGED] = g_signal_new (
"model_changed",
- G_TYPE_FROM_INTERFACE (interface),
+ G_TYPE_FROM_INTERFACE (iface),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ETableModelInterface, model_changed),
NULL, NULL, NULL,
@@ -68,7 +68,7 @@ e_table_model_default_init (ETableModelInterface *interface)
signals[MODEL_PRE_CHANGE] = g_signal_new (
"model_pre_change",
- G_TYPE_FROM_INTERFACE (interface),
+ G_TYPE_FROM_INTERFACE (iface),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ETableModelInterface, model_pre_change),
NULL, NULL, NULL,
@@ -76,7 +76,7 @@ e_table_model_default_init (ETableModelInterface *interface)
signals[MODEL_ROW_CHANGED] = g_signal_new (
"model_row_changed",
- G_TYPE_FROM_INTERFACE (interface),
+ G_TYPE_FROM_INTERFACE (iface),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ETableModelInterface, model_row_changed),
NULL, NULL, NULL,
@@ -85,7 +85,7 @@ e_table_model_default_init (ETableModelInterface *interface)
signals[MODEL_CELL_CHANGED] = g_signal_new (
"model_cell_changed",
- G_TYPE_FROM_INTERFACE (interface),
+ G_TYPE_FROM_INTERFACE (iface),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ETableModelInterface, model_cell_changed),
NULL, NULL, NULL,
@@ -95,7 +95,7 @@ e_table_model_default_init (ETableModelInterface *interface)
signals[MODEL_ROWS_INSERTED] = g_signal_new (
"model_rows_inserted",
- G_TYPE_FROM_INTERFACE (interface),
+ G_TYPE_FROM_INTERFACE (iface),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ETableModelInterface, model_rows_inserted),
NULL, NULL, NULL,
@@ -105,7 +105,7 @@ e_table_model_default_init (ETableModelInterface *interface)
signals[MODEL_ROWS_DELETED] = g_signal_new (
"model_rows_deleted",
- G_TYPE_FROM_INTERFACE (interface),
+ G_TYPE_FROM_INTERFACE (iface),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ETableModelInterface, model_rows_deleted),
NULL, NULL, NULL,
@@ -123,14 +123,14 @@ e_table_model_default_init (ETableModelInterface *interface)
gint
e_table_model_column_count (ETableModel *table_model)
{
- ETableModelInterface *interface;
+ ETableModelInterface *iface;
g_return_val_if_fail (E_IS_TABLE_MODEL (table_model), 0);
- interface = E_TABLE_MODEL_GET_INTERFACE (table_model);
- g_return_val_if_fail (interface->column_count != NULL, 0);
+ iface = E_TABLE_MODEL_GET_INTERFACE (table_model);
+ g_return_val_if_fail (iface->column_count != NULL, 0);
- return interface->column_count (table_model);
+ return iface->column_count (table_model);
}
/**
@@ -142,14 +142,14 @@ e_table_model_column_count (ETableModel *table_model)
gint
e_table_model_row_count (ETableModel *table_model)
{
- ETableModelInterface *interface;
+ ETableModelInterface *iface;
g_return_val_if_fail (E_IS_TABLE_MODEL (table_model), 0);
- interface = E_TABLE_MODEL_GET_INTERFACE (table_model);
- g_return_val_if_fail (interface->row_count != NULL, 0);
+ iface = E_TABLE_MODEL_GET_INTERFACE (table_model);
+ g_return_val_if_fail (iface->row_count != NULL, 0);
- return interface->row_count (table_model);
+ return iface->row_count (table_model);
}
/**
@@ -164,14 +164,14 @@ e_table_model_append_row (ETableModel *table_model,
ETableModel *source,
gint row)
{
- ETableModelInterface *interface;
+ ETableModelInterface *iface;
g_return_if_fail (E_IS_TABLE_MODEL (table_model));
- interface = E_TABLE_MODEL_GET_INTERFACE (table_model);
+ iface = E_TABLE_MODEL_GET_INTERFACE (table_model);
- if (interface->append_row != NULL)
- interface->append_row (table_model, source, row);
+ if (iface->append_row != NULL)
+ iface->append_row (table_model, source, row);
}
/**
@@ -198,14 +198,14 @@ e_table_model_value_at (ETableModel *table_model,
gint col,
gint row)
{
- ETableModelInterface *interface;
+ ETableModelInterface *iface;
g_return_val_if_fail (E_IS_TABLE_MODEL (table_model), NULL);
- interface = E_TABLE_MODEL_GET_INTERFACE (table_model);
- g_return_val_if_fail (interface->value_at != NULL, NULL);
+ iface = E_TABLE_MODEL_GET_INTERFACE (table_model);
+ g_return_val_if_fail (iface->value_at != NULL, NULL);
- return interface->value_at (table_model, col, row);
+ return iface->value_at (table_model, col, row);
}
/**
@@ -229,14 +229,14 @@ e_table_model_set_value_at (ETableModel *table_model,
gint row,
gconstpointer value)
{
- ETableModelInterface *interface;
+ ETableModelInterface *iface;
g_return_if_fail (E_IS_TABLE_MODEL (table_model));
- interface = E_TABLE_MODEL_GET_INTERFACE (table_model);
- g_return_if_fail (interface->set_value_at != NULL);
+ iface = E_TABLE_MODEL_GET_INTERFACE (table_model);
+ g_return_if_fail (iface->set_value_at != NULL);
- interface->set_value_at (table_model, col, row, value);
+ iface->set_value_at (table_model, col, row, value);
}
/**
@@ -253,14 +253,14 @@ e_table_model_is_cell_editable (ETableModel *table_model,
gint col,
gint row)
{
- ETableModelInterface *interface;
+ ETableModelInterface *iface;
g_return_val_if_fail (E_IS_TABLE_MODEL (table_model), FALSE);
- interface = E_TABLE_MODEL_GET_INTERFACE (table_model);
- g_return_val_if_fail (interface->is_cell_editable != NULL, FALSE);
+ iface = E_TABLE_MODEL_GET_INTERFACE (table_model);
+ g_return_val_if_fail (iface->is_cell_editable != NULL, FALSE);
- return interface->is_cell_editable (table_model, col, row);
+ return iface->is_cell_editable (table_model, col, row);
}
gpointer
@@ -268,16 +268,16 @@ e_table_model_duplicate_value (ETableModel *table_model,
gint col,
gconstpointer value)
{
- ETableModelInterface *interface;
+ ETableModelInterface *iface;
g_return_val_if_fail (E_IS_TABLE_MODEL (table_model), NULL);
- interface = E_TABLE_MODEL_GET_INTERFACE (table_model);
+ iface = E_TABLE_MODEL_GET_INTERFACE (table_model);
- if (interface->duplicate_value == NULL)
+ if (iface->duplicate_value == NULL)
return NULL;
- return interface->duplicate_value (table_model, col, value);
+ return iface->duplicate_value (table_model, col, value);
}
void
@@ -285,76 +285,76 @@ e_table_model_free_value (ETableModel *table_model,
gint col,
gpointer value)
{
- ETableModelInterface *interface;
+ ETableModelInterface *iface;
g_return_if_fail (E_IS_TABLE_MODEL (table_model));
- interface = E_TABLE_MODEL_GET_INTERFACE (table_model);
+ iface = E_TABLE_MODEL_GET_INTERFACE (table_model);
- if (interface->free_value != NULL)
- interface->free_value (table_model, col, value);
+ if (iface->free_value != NULL)
+ iface->free_value (table_model, col, value);
}
gboolean
e_table_model_has_save_id (ETableModel *table_model)
{
- ETableModelInterface *interface;
+ ETableModelInterface *iface;
g_return_val_if_fail (E_IS_TABLE_MODEL (table_model), FALSE);
- interface = E_TABLE_MODEL_GET_INTERFACE (table_model);
+ iface = E_TABLE_MODEL_GET_INTERFACE (table_model);
- if (interface->has_save_id == NULL)
+ if (iface->has_save_id == NULL)
return FALSE;
- return interface->has_save_id (table_model);
+ return iface->has_save_id (table_model);
}
gchar *
e_table_model_get_save_id (ETableModel *table_model,
gint row)
{
- ETableModelInterface *interface;
+ ETableModelInterface *iface;
g_return_val_if_fail (E_IS_TABLE_MODEL (table_model), NULL);
- interface = E_TABLE_MODEL_GET_INTERFACE (table_model);
+ iface = E_TABLE_MODEL_GET_INTERFACE (table_model);
- if (interface->get_save_id == NULL)
+ if (iface->get_save_id == NULL)
return NULL;
- return interface->get_save_id (table_model, row);
+ return iface->get_save_id (table_model, row);
}
gboolean
e_table_model_has_change_pending (ETableModel *table_model)
{
- ETableModelInterface *interface;
+ ETableModelInterface *iface;
g_return_val_if_fail (E_IS_TABLE_MODEL (table_model), FALSE);
- interface = E_TABLE_MODEL_GET_INTERFACE (table_model);
+ iface = E_TABLE_MODEL_GET_INTERFACE (table_model);
- if (interface->has_change_pending == NULL)
+ if (iface->has_change_pending == NULL)
return FALSE;
- return interface->has_change_pending (table_model);
+ return iface->has_change_pending (table_model);
}
gpointer
e_table_model_initialize_value (ETableModel *table_model,
gint col)
{
- ETableModelInterface *interface;
+ ETableModelInterface *iface;
g_return_val_if_fail (E_IS_TABLE_MODEL (table_model), NULL);
- interface = E_TABLE_MODEL_GET_INTERFACE (table_model);
+ iface = E_TABLE_MODEL_GET_INTERFACE (table_model);
- if (interface->initialize_value == NULL)
+ if (iface->initialize_value == NULL)
return NULL;
- return interface->initialize_value (table_model, col);
+ return iface->initialize_value (table_model, col);
}
gboolean
@@ -362,16 +362,16 @@ e_table_model_value_is_empty (ETableModel *table_model,
gint col,
gconstpointer value)
{
- ETableModelInterface *interface;
+ ETableModelInterface *iface;
g_return_val_if_fail (E_IS_TABLE_MODEL (table_model), FALSE);
- interface = E_TABLE_MODEL_GET_INTERFACE (table_model);
+ iface = E_TABLE_MODEL_GET_INTERFACE (table_model);
- if (interface->value_is_empty == NULL)
+ if (iface->value_is_empty == NULL)
return FALSE;
- return interface->value_is_empty (table_model, col, value);
+ return iface->value_is_empty (table_model, col, value);
}
gchar *
@@ -379,16 +379,16 @@ e_table_model_value_to_string (ETableModel *table_model,
gint col,
gconstpointer value)
{
- ETableModelInterface *interface;
+ ETableModelInterface *iface;
g_return_val_if_fail (E_IS_TABLE_MODEL (table_model), NULL);
- interface = E_TABLE_MODEL_GET_INTERFACE (table_model);
+ iface = E_TABLE_MODEL_GET_INTERFACE (table_model);
- if (interface->value_to_string == NULL)
+ if (iface->value_to_string == NULL)
return g_strdup ("");
- return interface->value_to_string (table_model, col, value);
+ return iface->value_to_string (table_model, col, value);
}
#if d(!)0
diff --git a/e-util/e-table-one.c b/e-util/e-table-one.c
index 9ac70237fe..5d8f104967 100644
--- a/e-util/e-table-one.c
+++ b/e-util/e-table-one.c
@@ -28,7 +28,7 @@
/* Forward Declarations */
static void e_table_one_table_model_init
- (ETableModelInterface *interface);
+ (ETableModelInterface *iface);
G_DEFINE_TYPE_WITH_CODE (
ETableOne,
@@ -194,20 +194,20 @@ e_table_one_class_init (ETableOneClass *class)
}
static void
-e_table_one_table_model_init (ETableModelInterface *interface)
+e_table_one_table_model_init (ETableModelInterface *iface)
{
- interface->column_count = table_one_column_count;
- interface->row_count = table_one_row_count;
-
- interface->value_at = table_one_value_at;
- interface->set_value_at = table_one_set_value_at;
- interface->is_cell_editable = table_one_is_cell_editable;
-
- interface->duplicate_value = table_one_duplicate_value;
- interface->free_value = table_one_free_value;
- interface->initialize_value = table_one_initialize_value;
- interface->value_is_empty = table_one_value_is_empty;
- interface->value_to_string = table_one_value_to_string;
+ iface->column_count = table_one_column_count;
+ iface->row_count = table_one_row_count;
+
+ iface->value_at = table_one_value_at;
+ iface->set_value_at = table_one_set_value_at;
+ iface->is_cell_editable = table_one_is_cell_editable;
+
+ iface->duplicate_value = table_one_duplicate_value;
+ iface->free_value = table_one_free_value;
+ iface->initialize_value = table_one_initialize_value;
+ iface->value_is_empty = table_one_value_is_empty;
+ iface->value_to_string = table_one_value_to_string;
}
static void
diff --git a/e-util/e-table-sorter.c b/e-util/e-table-sorter.c
index 81863256f0..6087b3c07d 100644
--- a/e-util/e-table-sorter.c
+++ b/e-util/e-table-sorter.c
@@ -35,7 +35,7 @@ enum {
};
/* Forward Declarations */
-static void e_table_sorter_interface_init (ESorterInterface *interface);
+static void e_table_sorter_interface_init (ESorterInterface *iface);
G_DEFINE_TYPE_WITH_CODE (
ETableSorter,
@@ -466,13 +466,13 @@ e_table_sorter_class_init (ETableSorterClass *class)
}
static void
-e_table_sorter_interface_init (ESorterInterface *interface)
+e_table_sorter_interface_init (ESorterInterface *iface)
{
- interface->model_to_sorted = table_sorter_model_to_sorted;
- interface->sorted_to_model = table_sorter_sorted_to_model;
- interface->get_model_to_sorted_array = table_sorter_get_model_to_sorted_array;
- interface->get_sorted_to_model_array = table_sorter_get_sorted_to_model_array;
- interface->needs_sorting = table_sorter_needs_sorting;
+ iface->model_to_sorted = table_sorter_model_to_sorted;
+ iface->sorted_to_model = table_sorter_sorted_to_model;
+ iface->get_model_to_sorted_array = table_sorter_get_model_to_sorted_array;
+ iface->get_sorted_to_model_array = table_sorter_get_sorted_to_model_array;
+ iface->needs_sorting = table_sorter_needs_sorting;
}
static void
diff --git a/e-util/e-table-specification.c b/e-util/e-table-specification.c
index 57e4ddf805..cff94d28e0 100644
--- a/e-util/e-table-specification.c
+++ b/e-util/e-table-specification.c
@@ -40,7 +40,7 @@ enum {
/* Forward Declarations */
static void e_table_specification_initable_init
- (GInitableIface *interface);
+ (GInitableIface *iface);
G_DEFINE_TYPE_WITH_CODE (
ETableSpecification,
@@ -559,9 +559,9 @@ e_table_specification_class_init (ETableSpecificationClass *class)
}
static void
-e_table_specification_initable_init (GInitableIface *interface)
+e_table_specification_initable_init (GInitableIface *iface)
{
- interface->init = table_specification_initable_init;
+ iface->init = table_specification_initable_init;
}
static void
diff --git a/e-util/e-table-subset.c b/e-util/e-table-subset.c
index d0e83aca37..b00dfb6f9c 100644
--- a/e-util/e-table-subset.c
+++ b/e-util/e-table-subset.c
@@ -55,7 +55,7 @@ struct _ETableSubsetPrivate {
/* Forward Declarations */
static void e_table_subset_table_model_init
- (ETableModelInterface *interface);
+ (ETableModelInterface *iface);
G_DEFINE_TYPE_WITH_CODE (
ETableSubset,
@@ -416,24 +416,24 @@ e_table_subset_class_init (ETableSubsetClass *class)
}
static void
-e_table_subset_table_model_init (ETableModelInterface *interface)
+e_table_subset_table_model_init (ETableModelInterface *iface)
{
- interface->column_count = table_subset_column_count;
- interface->row_count = table_subset_row_count;
- interface->append_row = table_subset_append_row;
+ iface->column_count = table_subset_column_count;
+ iface->row_count = table_subset_row_count;
+ iface->append_row = table_subset_append_row;
- interface->value_at = table_subset_value_at;
- interface->set_value_at = table_subset_set_value_at;
- interface->is_cell_editable = table_subset_is_cell_editable;
+ iface->value_at = table_subset_value_at;
+ iface->set_value_at = table_subset_set_value_at;
+ iface->is_cell_editable = table_subset_is_cell_editable;
- interface->has_save_id = table_subset_has_save_id;
- interface->get_save_id = table_subset_get_save_id;
+ iface->has_save_id = table_subset_has_save_id;
+ iface->get_save_id = table_subset_get_save_id;
- interface->duplicate_value = table_subset_duplicate_value;
- interface->free_value = table_subset_free_value;
- interface->initialize_value = table_subset_initialize_value;
- interface->value_is_empty = table_subset_value_is_empty;
- interface->value_to_string = table_subset_value_to_string;
+ iface->duplicate_value = table_subset_duplicate_value;
+ iface->free_value = table_subset_free_value;
+ iface->initialize_value = table_subset_initialize_value;
+ iface->value_is_empty = table_subset_value_is_empty;
+ iface->value_to_string = table_subset_value_to_string;
}
static void
diff --git a/e-util/e-tree-model.c b/e-util/e-tree-model.c
index 6e86d94789..1bf702ca34 100644
--- a/e-util/e-tree-model.c
+++ b/e-util/e-tree-model.c
@@ -33,11 +33,11 @@ static guint signals[LAST_SIGNAL];
G_DEFINE_INTERFACE (ETreeModel, e_tree_model, G_TYPE_OBJECT)
static void
-e_tree_model_default_init (ETreeModelInterface *interface)
+e_tree_model_default_init (ETreeModelInterface *iface)
{
signals[PRE_CHANGE] = g_signal_new (
"pre_change",
- G_TYPE_FROM_INTERFACE (interface),
+ G_TYPE_FROM_INTERFACE (iface),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ETreeModelInterface, pre_change),
NULL, NULL, NULL,
@@ -45,7 +45,7 @@ e_tree_model_default_init (ETreeModelInterface *interface)
signals[REBUILT] = g_signal_new (
"rebuilt",
- G_TYPE_FROM_INTERFACE (interface),
+ G_TYPE_FROM_INTERFACE (iface),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ETreeModelInterface, rebuilt),
NULL, NULL, NULL,
@@ -53,7 +53,7 @@ e_tree_model_default_init (ETreeModelInterface *interface)
signals[NODE_CHANGED] = g_signal_new (
"node_changed",
- G_TYPE_FROM_INTERFACE (interface),
+ G_TYPE_FROM_INTERFACE (iface),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ETreeModelInterface, node_changed),
NULL, NULL, NULL,
@@ -62,7 +62,7 @@ e_tree_model_default_init (ETreeModelInterface *interface)
signals[NODE_DATA_CHANGED] = g_signal_new (
"node_data_changed",
- G_TYPE_FROM_INTERFACE (interface),
+ G_TYPE_FROM_INTERFACE (iface),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ETreeModelInterface, node_data_changed),
NULL, NULL, NULL,
@@ -71,7 +71,7 @@ e_tree_model_default_init (ETreeModelInterface *interface)
signals[NODE_INSERTED] = g_signal_new (
"node_inserted",
- G_TYPE_FROM_INTERFACE (interface),
+ G_TYPE_FROM_INTERFACE (iface),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ETreeModelInterface, node_inserted),
NULL, NULL, NULL,
@@ -81,7 +81,7 @@ e_tree_model_default_init (ETreeModelInterface *interface)
signals[NODE_REMOVED] = g_signal_new (
"node_removed",
- G_TYPE_FROM_INTERFACE (interface),
+ G_TYPE_FROM_INTERFACE (iface),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ETreeModelInterface, node_removed),
NULL, NULL, NULL,
@@ -92,7 +92,7 @@ e_tree_model_default_init (ETreeModelInterface *interface)
signals[NODE_DELETED] = g_signal_new (
"node_deleted",
- G_TYPE_FROM_INTERFACE (interface),
+ G_TYPE_FROM_INTERFACE (iface),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ETreeModelInterface, node_deleted),
NULL, NULL, NULL,
@@ -231,14 +231,14 @@ e_tree_model_node_deleted (ETreeModel *tree_model,
ETreePath
e_tree_model_get_root (ETreeModel *tree_model)
{
- ETreeModelInterface *interface;
+ ETreeModelInterface *iface;
g_return_val_if_fail (E_IS_TREE_MODEL (tree_model), NULL);
- interface = E_TREE_MODEL_GET_INTERFACE (tree_model);
- g_return_val_if_fail (interface->get_root != NULL, NULL);
+ iface = E_TREE_MODEL_GET_INTERFACE (tree_model);
+ g_return_val_if_fail (iface->get_root != NULL, NULL);
- return interface->get_root (tree_model);
+ return iface->get_root (tree_model);
}
/**
@@ -254,14 +254,14 @@ ETreePath
e_tree_model_node_get_parent (ETreeModel *tree_model,
ETreePath path)
{
- ETreeModelInterface *interface;
+ ETreeModelInterface *iface;
g_return_val_if_fail (E_IS_TREE_MODEL (tree_model), NULL);
- interface = E_TREE_MODEL_GET_INTERFACE (tree_model);
- g_return_val_if_fail (interface->get_parent != NULL, NULL);
+ iface = E_TREE_MODEL_GET_INTERFACE (tree_model);
+ g_return_val_if_fail (iface->get_parent != NULL, NULL);
- return interface->get_parent (tree_model, path);
+ return iface->get_parent (tree_model, path);
}
/**
@@ -277,14 +277,14 @@ ETreePath
e_tree_model_node_get_first_child (ETreeModel *tree_model,
ETreePath path)
{
- ETreeModelInterface *interface;
+ ETreeModelInterface *iface;
g_return_val_if_fail (E_IS_TREE_MODEL (tree_model), NULL);
- interface = E_TREE_MODEL_GET_INTERFACE (tree_model);
- g_return_val_if_fail (interface->get_first_child != NULL, NULL);
+ iface = E_TREE_MODEL_GET_INTERFACE (tree_model);
+ g_return_val_if_fail (iface->get_first_child != NULL, NULL);
- return interface->get_first_child (tree_model, path);
+ return iface->get_first_child (tree_model, path);
}
/**
@@ -300,14 +300,14 @@ ETreePath
e_tree_model_node_get_next (ETreeModel *tree_model,
ETreePath path)
{
- ETreeModelInterface *interface;
+ ETreeModelInterface *iface;
g_return_val_if_fail (E_IS_TREE_MODEL (tree_model), NULL);
- interface = E_TREE_MODEL_GET_INTERFACE (tree_model);
- g_return_val_if_fail (interface->get_next != NULL, NULL);
+ iface = E_TREE_MODEL_GET_INTERFACE (tree_model);
+ g_return_val_if_fail (iface->get_next != NULL, NULL);
- return interface->get_next (tree_model, path);
+ return iface->get_next (tree_model, path);
}
/**
@@ -323,14 +323,14 @@ gboolean
e_tree_model_node_is_root (ETreeModel *tree_model,
ETreePath path)
{
- ETreeModelInterface *interface;
+ ETreeModelInterface *iface;
g_return_val_if_fail (E_IS_TREE_MODEL (tree_model), FALSE);
- interface = E_TREE_MODEL_GET_INTERFACE (tree_model);
- g_return_val_if_fail (interface->is_root != NULL, FALSE);
+ iface = E_TREE_MODEL_GET_INTERFACE (tree_model);
+ g_return_val_if_fail (iface->is_root != NULL, FALSE);
- return interface->is_root (tree_model, path);
+ return iface->is_root (tree_model, path);
}
/**
@@ -346,42 +346,42 @@ gboolean
e_tree_model_node_is_expandable (ETreeModel *tree_model,
ETreePath path)
{
- ETreeModelInterface *interface;
+ ETreeModelInterface *iface;
g_return_val_if_fail (E_IS_TREE_MODEL (tree_model), FALSE);
g_return_val_if_fail (path != NULL, FALSE);
- interface = E_TREE_MODEL_GET_INTERFACE (tree_model);
- g_return_val_if_fail (interface->is_expandable != NULL, FALSE);
+ iface = E_TREE_MODEL_GET_INTERFACE (tree_model);
+ g_return_val_if_fail (iface->is_expandable != NULL, FALSE);
- return interface->is_expandable (tree_model, path);
+ return iface->is_expandable (tree_model, path);
}
guint
e_tree_model_node_get_n_nodes (ETreeModel *tree_model)
{
- ETreeModelInterface *interface;
+ ETreeModelInterface *iface;
g_return_val_if_fail (E_IS_TREE_MODEL (tree_model), 0);
- interface = E_TREE_MODEL_GET_INTERFACE (tree_model);
- g_return_val_if_fail (interface->get_n_nodes != NULL, 0);
+ iface = E_TREE_MODEL_GET_INTERFACE (tree_model);
+ g_return_val_if_fail (iface->get_n_nodes != NULL, 0);
- return interface->get_n_nodes (tree_model);
+ return iface->get_n_nodes (tree_model);
}
guint
e_tree_model_node_get_n_children (ETreeModel *tree_model,
ETreePath path)
{
- ETreeModelInterface *interface;
+ ETreeModelInterface *iface;
g_return_val_if_fail (E_IS_TREE_MODEL (tree_model), 0);
- interface = E_TREE_MODEL_GET_INTERFACE (tree_model);
- g_return_val_if_fail (interface->get_n_children != NULL, 0);
+ iface = E_TREE_MODEL_GET_INTERFACE (tree_model);
+ g_return_val_if_fail (iface->get_n_children != NULL, 0);
- return interface->get_n_children (tree_model, path);
+ return iface->get_n_children (tree_model, path);
}
/**
@@ -397,14 +397,14 @@ guint
e_tree_model_node_depth (ETreeModel *tree_model,
ETreePath path)
{
- ETreeModelInterface *interface;
+ ETreeModelInterface *iface;
g_return_val_if_fail (E_IS_TREE_MODEL (tree_model), 0);
- interface = E_TREE_MODEL_GET_INTERFACE (tree_model);
- g_return_val_if_fail (interface->depth != NULL, 0);
+ iface = E_TREE_MODEL_GET_INTERFACE (tree_model);
+ g_return_val_if_fail (iface->depth != NULL, 0);
- return interface->depth (tree_model, path);
+ return iface->depth (tree_model, path);
}
/**
@@ -418,14 +418,14 @@ e_tree_model_node_depth (ETreeModel *tree_model,
gboolean
e_tree_model_get_expanded_default (ETreeModel *tree_model)
{
- ETreeModelInterface *interface;
+ ETreeModelInterface *iface;
g_return_val_if_fail (E_IS_TREE_MODEL (tree_model), FALSE);
- interface = E_TREE_MODEL_GET_INTERFACE (tree_model);
- g_return_val_if_fail (interface->get_expanded_default != NULL, FALSE);
+ iface = E_TREE_MODEL_GET_INTERFACE (tree_model);
+ g_return_val_if_fail (iface->get_expanded_default != NULL, FALSE);
- return interface->get_expanded_default (tree_model);
+ return iface->get_expanded_default (tree_model);
}
/**
@@ -439,14 +439,14 @@ e_tree_model_get_expanded_default (ETreeModel *tree_model)
gint
e_tree_model_column_count (ETreeModel *tree_model)
{
- ETreeModelInterface *interface;
+ ETreeModelInterface *iface;
g_return_val_if_fail (E_IS_TREE_MODEL (tree_model), 0);
- interface = E_TREE_MODEL_GET_INTERFACE (tree_model);
- g_return_val_if_fail (interface->column_count != NULL, 0);
+ iface = E_TREE_MODEL_GET_INTERFACE (tree_model);
+ g_return_val_if_fail (iface->column_count != NULL, 0);
- return interface->column_count (tree_model);
+ return iface->column_count (tree_model);
}
/**
@@ -462,14 +462,14 @@ gchar *
e_tree_model_get_save_id (ETreeModel *tree_model,
ETreePath path)
{
- ETreeModelInterface *interface;
+ ETreeModelInterface *iface;
g_return_val_if_fail (E_IS_TREE_MODEL (tree_model), NULL);
- interface = E_TREE_MODEL_GET_INTERFACE (tree_model);
- g_return_val_if_fail (interface->get_save_id != NULL, NULL);
+ iface = E_TREE_MODEL_GET_INTERFACE (tree_model);
+ g_return_val_if_fail (iface->get_save_id != NULL, NULL);
- return interface->get_save_id (tree_model, path);
+ return iface->get_save_id (tree_model, path);
}
/**
@@ -488,14 +488,14 @@ ETreePath
e_tree_model_get_node_by_id (ETreeModel *tree_model,
const gchar *save_id)
{
- ETreeModelInterface *interface;
+ ETreeModelInterface *iface;
g_return_val_if_fail (E_IS_TREE_MODEL (tree_model), NULL);
- interface = E_TREE_MODEL_GET_INTERFACE (tree_model);
- g_return_val_if_fail (interface->get_node_by_id != NULL, NULL);
+ iface = E_TREE_MODEL_GET_INTERFACE (tree_model);
+ g_return_val_if_fail (iface->get_node_by_id != NULL, NULL);
- return interface->get_node_by_id (tree_model, save_id);
+ return iface->get_node_by_id (tree_model, save_id);
}
/**
@@ -523,14 +523,14 @@ e_tree_model_sort_value_at (ETreeModel *tree_model,
ETreePath path,
gint col)
{
- ETreeModelInterface *interface;
+ ETreeModelInterface *iface;
g_return_val_if_fail (E_IS_TREE_MODEL (tree_model), NULL);
- interface = E_TREE_MODEL_GET_INTERFACE (tree_model);
- g_return_val_if_fail (interface->sort_value_at != NULL, NULL);
+ iface = E_TREE_MODEL_GET_INTERFACE (tree_model);
+ g_return_val_if_fail (iface->sort_value_at != NULL, NULL);
- return interface->sort_value_at (tree_model, path, col);
+ return iface->sort_value_at (tree_model, path, col);
}
/**
@@ -557,14 +557,14 @@ e_tree_model_value_at (ETreeModel *tree_model,
ETreePath path,
gint col)
{
- ETreeModelInterface *interface;
+ ETreeModelInterface *iface;
g_return_val_if_fail (E_IS_TREE_MODEL (tree_model), NULL);
- interface = E_TREE_MODEL_GET_INTERFACE (tree_model);
- g_return_val_if_fail (interface->value_at != NULL, NULL);
+ iface = E_TREE_MODEL_GET_INTERFACE (tree_model);
+ g_return_val_if_fail (iface->value_at != NULL, NULL);
- return interface->value_at (tree_model, path, col);
+ return iface->value_at (tree_model, path, col);
}
/**
@@ -581,14 +581,14 @@ e_tree_model_duplicate_value (ETreeModel *tree_model,
gint col,
gconstpointer value)
{
- ETreeModelInterface *interface;
+ ETreeModelInterface *iface;
g_return_val_if_fail (E_IS_TREE_MODEL (tree_model), NULL);
- interface = E_TREE_MODEL_GET_INTERFACE (tree_model);
- g_return_val_if_fail (interface->duplicate_value != NULL, NULL);
+ iface = E_TREE_MODEL_GET_INTERFACE (tree_model);
+ g_return_val_if_fail (iface->duplicate_value != NULL, NULL);
- return interface->duplicate_value (tree_model, col, value);
+ return iface->duplicate_value (tree_model, col, value);
}
/**
@@ -605,14 +605,14 @@ e_tree_model_free_value (ETreeModel *tree_model,
gint col,
gpointer value)
{
- ETreeModelInterface *interface;
+ ETreeModelInterface *iface;
g_return_if_fail (E_IS_TREE_MODEL (tree_model));
- interface = E_TREE_MODEL_GET_INTERFACE (tree_model);
- g_return_if_fail (interface->free_value != NULL);
+ iface = E_TREE_MODEL_GET_INTERFACE (tree_model);
+ g_return_if_fail (iface->free_value != NULL);
- interface->free_value (tree_model, col, value);
+ iface->free_value (tree_model, col, value);
}
/**
@@ -628,14 +628,14 @@ gpointer
e_tree_model_initialize_value (ETreeModel *tree_model,
gint col)
{
- ETreeModelInterface *interface;
+ ETreeModelInterface *iface;
g_return_val_if_fail (E_IS_TREE_MODEL (tree_model), NULL);
- interface = E_TREE_MODEL_GET_INTERFACE (tree_model);
- g_return_val_if_fail (interface->initialize_value != NULL, NULL);
+ iface = E_TREE_MODEL_GET_INTERFACE (tree_model);
+ g_return_val_if_fail (iface->initialize_value != NULL, NULL);
- return interface->initialize_value (tree_model, col);
+ return iface->initialize_value (tree_model, col);
}
/**
@@ -652,14 +652,14 @@ e_tree_model_value_is_empty (ETreeModel *tree_model,
gint col,
gconstpointer value)
{
- ETreeModelInterface *interface;
+ ETreeModelInterface *iface;
g_return_val_if_fail (E_IS_TREE_MODEL (tree_model), TRUE);
- interface = E_TREE_MODEL_GET_INTERFACE (tree_model);
- g_return_val_if_fail (interface->value_is_empty != NULL, TRUE);
+ iface = E_TREE_MODEL_GET_INTERFACE (tree_model);
+ g_return_val_if_fail (iface->value_is_empty != NULL, TRUE);
- return interface->value_is_empty (tree_model, col, value);
+ return iface->value_is_empty (tree_model, col, value);
}
/**
@@ -676,14 +676,14 @@ e_tree_model_value_to_string (ETreeModel *tree_model,
gint col,
gconstpointer value)
{
- ETreeModelInterface *interface;
+ ETreeModelInterface *iface;
g_return_val_if_fail (E_IS_TREE_MODEL (tree_model), NULL);
- interface = E_TREE_MODEL_GET_INTERFACE (tree_model);
- g_return_val_if_fail (interface->value_to_string != NULL, NULL);
+ iface = E_TREE_MODEL_GET_INTERFACE (tree_model);
+ g_return_val_if_fail (iface->value_to_string != NULL, NULL);
- return interface->value_to_string (tree_model, col, value);
+ return iface->value_to_string (tree_model, col, value);
}
/**
diff --git a/e-util/e-tree-table-adapter.c b/e-util/e-tree-table-adapter.c
index 88759d0ece..7fd12bb317 100644
--- a/e-util/e-tree-table-adapter.c
+++ b/e-util/e-tree-table-adapter.c
@@ -98,7 +98,7 @@ enum {
/* Forward Declarations */
static void e_tree_table_adapter_table_model_init
- (ETableModelInterface *interface);
+ (ETableModelInterface *iface);
static guint signals[LAST_SIGNAL];
@@ -1052,24 +1052,24 @@ e_tree_table_adapter_class_init (ETreeTableAdapterClass *class)
}
static void
-e_tree_table_adapter_table_model_init (ETableModelInterface *interface)
+e_tree_table_adapter_table_model_init (ETableModelInterface *iface)
{
- interface->column_count = tree_table_adapter_column_count;
- interface->row_count = tree_table_adapter_row_count;
- interface->append_row = tree_table_adapter_append_row;
+ iface->column_count = tree_table_adapter_column_count;
+ iface->row_count = tree_table_adapter_row_count;
+ iface->append_row = tree_table_adapter_append_row;
- interface->value_at = tree_table_adapter_value_at;
- interface->set_value_at = tree_table_adapter_set_value_at;
- interface->is_cell_editable = tree_table_adapter_is_cell_editable;
+ iface->value_at = tree_table_adapter_value_at;
+ iface->set_value_at = tree_table_adapter_set_value_at;
+ iface->is_cell_editable = tree_table_adapter_is_cell_editable;
- interface->has_save_id = tree_table_adapter_has_save_id;
- interface->get_save_id = tree_table_adapter_get_save_id;
+ iface->has_save_id = tree_table_adapter_has_save_id;
+ iface->get_save_id = tree_table_adapter_get_save_id;
- interface->duplicate_value = tree_table_adapter_duplicate_value;
- interface->free_value = tree_table_adapter_free_value;
- interface->initialize_value = tree_table_adapter_initialize_value;
- interface->value_is_empty = tree_table_adapter_value_is_empty;
- interface->value_to_string = tree_table_adapter_value_to_string;
+ iface->duplicate_value = tree_table_adapter_duplicate_value;
+ iface->free_value = tree_table_adapter_free_value;
+ iface->initialize_value = tree_table_adapter_initialize_value;
+ iface->value_is_empty = tree_table_adapter_value_is_empty;
+ iface->value_to_string = tree_table_adapter_value_to_string;
}
static void
diff --git a/e-util/e-web-view-gtkhtml.c b/e-util/e-web-view-gtkhtml.c
index 63c69aa973..0dd6bce99b 100644
--- a/e-util/e-web-view-gtkhtml.c
+++ b/e-util/e-web-view-gtkhtml.c
@@ -124,8 +124,8 @@ static const gchar *ui =
"</ui>";
/* Forward Declarations */
-static void e_web_view_gtkhtml_alert_sink_init (EAlertSinkInterface *interface);
-static void e_web_view_gtkhtml_selectable_init (ESelectableInterface *interface);
+static void e_web_view_gtkhtml_alert_sink_init (EAlertSinkInterface *iface);
+static void e_web_view_gtkhtml_selectable_init (ESelectableInterface *iface);
G_DEFINE_TYPE_WITH_CODE (
EWebViewGtkHTML,
@@ -1592,19 +1592,19 @@ e_web_view_gtkhtml_class_init (EWebViewGtkHTMLClass *class)
}
static void
-e_web_view_gtkhtml_alert_sink_init (EAlertSinkInterface *interface)
+e_web_view_gtkhtml_alert_sink_init (EAlertSinkInterface *iface)
{
- interface->submit_alert = web_view_gtkhtml_submit_alert;
+ iface->submit_alert = web_view_gtkhtml_submit_alert;
}
static void
-e_web_view_gtkhtml_selectable_init (ESelectableInterface *interface)
+e_web_view_gtkhtml_selectable_init (ESelectableInterface *iface)
{
- interface->update_actions = web_view_gtkhtml_selectable_update_actions;
- interface->cut_clipboard = web_view_gtkhtml_selectable_cut_clipboard;
- interface->copy_clipboard = web_view_gtkhtml_selectable_copy_clipboard;
- interface->paste_clipboard = web_view_gtkhtml_selectable_paste_clipboard;
- interface->select_all = web_view_gtkhtml_selectable_select_all;
+ iface->update_actions = web_view_gtkhtml_selectable_update_actions;
+ iface->cut_clipboard = web_view_gtkhtml_selectable_cut_clipboard;
+ iface->copy_clipboard = web_view_gtkhtml_selectable_copy_clipboard;
+ iface->paste_clipboard = web_view_gtkhtml_selectable_paste_clipboard;
+ iface->select_all = web_view_gtkhtml_selectable_select_all;
}
static void
diff --git a/e-util/e-web-view.c b/e-util/e-web-view.c
index b69be96eb0..8e8f852fbb 100644
--- a/e-util/e-web-view.c
+++ b/e-util/e-web-view.c
@@ -132,8 +132,8 @@ static const gchar *ui =
"</ui>";
/* Forward Declarations */
-static void e_web_view_alert_sink_init (EAlertSinkInterface *interface);
-static void e_web_view_selectable_init (ESelectableInterface *interface);
+static void e_web_view_alert_sink_init (EAlertSinkInterface *iface);
+static void e_web_view_selectable_init (ESelectableInterface *iface);
G_DEFINE_TYPE_WITH_CODE (
EWebView,
@@ -1569,19 +1569,19 @@ e_web_view_class_init (EWebViewClass *class)
}
static void
-e_web_view_alert_sink_init (EAlertSinkInterface *interface)
+e_web_view_alert_sink_init (EAlertSinkInterface *iface)
{
- interface->submit_alert = web_view_submit_alert;
+ iface->submit_alert = web_view_submit_alert;
}
static void
-e_web_view_selectable_init (ESelectableInterface *interface)
+e_web_view_selectable_init (ESelectableInterface *iface)
{
- interface->update_actions = web_view_selectable_update_actions;
- interface->cut_clipboard = web_view_selectable_cut_clipboard;
- interface->copy_clipboard = web_view_selectable_copy_clipboard;
- interface->paste_clipboard = web_view_selectable_paste_clipboard;
- interface->select_all = web_view_selectable_select_all;
+ iface->update_actions = web_view_selectable_update_actions;
+ iface->cut_clipboard = web_view_selectable_cut_clipboard;
+ iface->copy_clipboard = web_view_selectable_copy_clipboard;
+ iface->paste_clipboard = web_view_selectable_paste_clipboard;
+ iface->select_all = web_view_selectable_select_all;
}
static void
diff --git a/e-util/evolution-source-viewer.c b/e-util/evolution-source-viewer.c
index 8d6db0a615..71f76d61e8 100644
--- a/e-util/evolution-source-viewer.c
+++ b/e-util/evolution-source-viewer.c
@@ -116,7 +116,7 @@ gboolean e_source_viewer_set_selected_source
GNode * e_source_viewer_build_display_tree
(ESourceViewer *viewer);
-static void e_source_viewer_initable_init (GInitableIface *interface);
+static void e_source_viewer_initable_init (GInitableIface *iface);
G_DEFINE_TYPE_WITH_CODE (
ESourceViewer,
@@ -909,9 +909,9 @@ e_source_viewer_class_init (ESourceViewerClass *class)
}
static void
-e_source_viewer_initable_init (GInitableIface *interface)
+e_source_viewer_initable_init (GInitableIface *iface)
{
- interface->init = source_viewer_initable_init;
+ iface->init = source_viewer_initable_init;
}
static void