diff options
Diffstat (limited to 'widgets')
50 files changed, 109 insertions, 50 deletions
diff --git a/widgets/menus/gal-view-factory-etable.c b/widgets/menus/gal-view-factory-etable.c index 8c744e1051..054acb87f9 100644 --- a/widgets/menus/gal-view-factory-etable.c +++ b/widgets/menus/gal-view-factory-etable.c @@ -159,7 +159,9 @@ gal_view_factory_etable_class_init (GalViewFactoryEtableClass *class) static void gal_view_factory_etable_init (GalViewFactoryEtable *factory) { - factory->priv = G_TYPE_INSTANCE_GET_PRIVATE (factory, GAL_TYPE_VIEW_FACTORY_ETABLE, GalViewFactoryEtablePrivate); + factory->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + factory, GAL_TYPE_VIEW_FACTORY_ETABLE, + GalViewFactoryEtablePrivate); } /** diff --git a/widgets/misc/e-account-combo-box.c b/widgets/misc/e-account-combo-box.c index ed3615a276..40504a0083 100644 --- a/widgets/misc/e-account-combo-box.c +++ b/widgets/misc/e-account-combo-box.c @@ -315,7 +315,8 @@ e_account_combo_box_init (EAccountComboBox *combo_box) (GDestroyNotify) g_object_unref, (GDestroyNotify) gtk_tree_row_reference_free); - combo_box->priv = G_TYPE_INSTANCE_GET_PRIVATE (combo_box, E_TYPE_ACCOUNT_COMBO_BOX, EAccountComboBoxPrivate); + combo_box->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + combo_box, E_TYPE_ACCOUNT_COMBO_BOX, EAccountComboBoxPrivate); combo_box->priv->index = index; } diff --git a/widgets/misc/e-account-manager.c b/widgets/misc/e-account-manager.c index e4ab1e798d..b252690c06 100644 --- a/widgets/misc/e-account-manager.c +++ b/widgets/misc/e-account-manager.c @@ -256,7 +256,8 @@ e_account_manager_init (EAccountManager *manager) GtkWidget *container; GtkWidget *widget; - manager->priv = G_TYPE_INSTANCE_GET_PRIVATE (manager, E_TYPE_ACCOUNT_MANAGER, EAccountManagerPrivate); + manager->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + manager, E_TYPE_ACCOUNT_MANAGER, EAccountManagerPrivate); gtk_table_resize (GTK_TABLE (manager), 1, 2); gtk_table_set_col_spacings (GTK_TABLE (manager), 6); diff --git a/widgets/misc/e-account-tree-view.c b/widgets/misc/e-account-tree-view.c index 5a0ace2403..7dba811977 100644 --- a/widgets/misc/e-account-tree-view.c +++ b/widgets/misc/e-account-tree-view.c @@ -478,7 +478,8 @@ e_account_tree_view_init (EAccountTreeView *tree_view) (GDestroyNotify) g_object_unref, (GDestroyNotify) gtk_tree_row_reference_free); - tree_view->priv = G_TYPE_INSTANCE_GET_PRIVATE (tree_view, E_TYPE_ACCOUNT_TREE_VIEW, EAccountTreeViewPrivate); + tree_view->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + tree_view, E_TYPE_ACCOUNT_TREE_VIEW, EAccountTreeViewPrivate); tree_view->priv->index = index; selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (tree_view)); diff --git a/widgets/misc/e-action-combo-box.c b/widgets/misc/e-action-combo-box.c index 5c9c44267b..9554a59b77 100644 --- a/widgets/misc/e-action-combo-box.c +++ b/widgets/misc/e-action-combo-box.c @@ -427,7 +427,8 @@ e_action_combo_box_class_init (EActionComboBoxClass *class) static void e_action_combo_box_init (EActionComboBox *combo_box) { - combo_box->priv = G_TYPE_INSTANCE_GET_PRIVATE (combo_box, E_TYPE_ACTION_COMBO_BOX, EActionComboBoxPrivate); + combo_box->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + combo_box, E_TYPE_ACTION_COMBO_BOX, EActionComboBoxPrivate); combo_box->priv->index = g_hash_table_new_full ( g_direct_hash, g_direct_equal, diff --git a/widgets/misc/e-activity-bar.c b/widgets/misc/e-activity-bar.c index e23e043b02..44e169ffc1 100644 --- a/widgets/misc/e-activity-bar.c +++ b/widgets/misc/e-activity-bar.c @@ -253,7 +253,8 @@ e_activity_bar_init (EActivityBar *bar) GtkWidget *container; GtkWidget *widget; - bar->priv = G_TYPE_INSTANCE_GET_PRIVATE (bar, E_TYPE_ACTIVITY_BAR, EActivityBarPrivate); + bar->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + bar, E_TYPE_ACTIVITY_BAR, EActivityBarPrivate); container = gtk_info_bar_get_content_area (GTK_INFO_BAR (bar)); diff --git a/widgets/misc/e-activity-proxy.c b/widgets/misc/e-activity-proxy.c index b949c1caa4..d52451fa37 100644 --- a/widgets/misc/e-activity-proxy.c +++ b/widgets/misc/e-activity-proxy.c @@ -259,7 +259,8 @@ e_activity_proxy_init (EActivityProxy *proxy) GtkWidget *container; GtkWidget *widget; - proxy->priv = G_TYPE_INSTANCE_GET_PRIVATE (proxy, E_TYPE_ACTIVITY_PROXY, EActivityProxyPrivate); + proxy->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + proxy, E_TYPE_ACTIVITY_PROXY, EActivityProxyPrivate); container = GTK_WIDGET (proxy); diff --git a/widgets/misc/e-alert-bar.c b/widgets/misc/e-alert-bar.c index 8fa7eff6ba..2d3fb9fe72 100644 --- a/widgets/misc/e-alert-bar.c +++ b/widgets/misc/e-alert-bar.c @@ -180,7 +180,8 @@ e_alert_bar_init (EAlertBar *alert_bar) PangoAttribute *attr; PangoAttrList *attr_list; - alert_bar->priv = G_TYPE_INSTANCE_GET_PRIVATE (alert_bar, E_TYPE_ALERT_BAR, EAlertBarPrivate); + alert_bar->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + alert_bar, E_TYPE_ALERT_BAR, EAlertBarPrivate); g_queue_init (&alert_bar->priv->alerts); diff --git a/widgets/misc/e-attachment-button.c b/widgets/misc/e-attachment-button.c index 8a9b135abd..f5ff2d0865 100644 --- a/widgets/misc/e-attachment-button.c +++ b/widgets/misc/e-attachment-button.c @@ -564,7 +564,8 @@ e_attachment_button_init (EAttachmentButton *button) GtkWidget *widget; gint n_targets; - button->priv = G_TYPE_INSTANCE_GET_PRIVATE (button, E_TYPE_ATTACHMENT_BUTTON, EAttachmentButtonPrivate); + button->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + button, E_TYPE_ATTACHMENT_BUTTON, EAttachmentButtonPrivate); /* Configure Widgets */ diff --git a/widgets/misc/e-attachment-dialog.c b/widgets/misc/e-attachment-dialog.c index a85e0bef98..90641078df 100644 --- a/widgets/misc/e-attachment-dialog.c +++ b/widgets/misc/e-attachment-dialog.c @@ -291,7 +291,8 @@ e_attachment_dialog_init (EAttachmentDialog *dialog) GtkWidget *container; GtkWidget *widget; - dialog->priv = G_TYPE_INSTANCE_GET_PRIVATE (dialog, E_TYPE_ATTACHMENT_DIALOG, EAttachmentDialogPrivate); + dialog->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + dialog, E_TYPE_ATTACHMENT_DIALOG, EAttachmentDialogPrivate); gtk_dialog_add_button ( GTK_DIALOG (dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL); diff --git a/widgets/misc/e-attachment-handler-image.c b/widgets/misc/e-attachment-handler-image.c index 1c850685be..e7e3658873 100644 --- a/widgets/misc/e-attachment-handler-image.c +++ b/widgets/misc/e-attachment-handler-image.c @@ -243,5 +243,7 @@ e_attachment_handler_image_class_init (EAttachmentHandlerImageClass *class) static void e_attachment_handler_image_init (EAttachmentHandlerImage *handler) { - handler->priv = G_TYPE_INSTANCE_GET_PRIVATE (handler, E_TYPE_ATTACHMENT_HANDLER_IMAGE, EAttachmentHandlerImagePrivate); + handler->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + handler, E_TYPE_ATTACHMENT_HANDLER_IMAGE, + EAttachmentHandlerImagePrivate); } diff --git a/widgets/misc/e-attachment-handler.c b/widgets/misc/e-attachment-handler.c index c125d29ea5..7f68331acb 100644 --- a/widgets/misc/e-attachment-handler.c +++ b/widgets/misc/e-attachment-handler.c @@ -73,7 +73,8 @@ e_attachment_handler_class_init (EAttachmentHandlerClass *class) static void e_attachment_handler_init (EAttachmentHandler *handler) { - handler->priv = G_TYPE_INSTANCE_GET_PRIVATE (handler, E_TYPE_ATTACHMENT_HANDLER, EAttachmentHandlerPrivate); + handler->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + handler, E_TYPE_ATTACHMENT_HANDLER, EAttachmentHandlerPrivate); } EAttachmentView * diff --git a/widgets/misc/e-attachment-icon-view.c b/widgets/misc/e-attachment-icon-view.c index 5677370f0b..d5dd557ce6 100644 --- a/widgets/misc/e-attachment-icon-view.c +++ b/widgets/misc/e-attachment-icon-view.c @@ -527,7 +527,9 @@ e_attachment_icon_view_class_init (EAttachmentIconViewClass *class) static void e_attachment_icon_view_init (EAttachmentIconView *icon_view) { - icon_view->priv = G_TYPE_INSTANCE_GET_PRIVATE (icon_view, E_TYPE_ATTACHMENT_ICON_VIEW, EAttachmentIconViewPrivate); + icon_view->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + icon_view, E_TYPE_ATTACHMENT_ICON_VIEW, + EAttachmentIconViewPrivate); e_attachment_view_init (E_ATTACHMENT_VIEW (icon_view)); diff --git a/widgets/misc/e-attachment-paned.c b/widgets/misc/e-attachment-paned.c index 73773f25a1..406e247eb2 100644 --- a/widgets/misc/e-attachment-paned.c +++ b/widgets/misc/e-attachment-paned.c @@ -519,7 +519,8 @@ e_attachment_paned_init (EAttachmentPaned *paned) GtkWidget *widget; GtkAction *action; - paned->priv = G_TYPE_INSTANCE_GET_PRIVATE (paned, E_TYPE_ATTACHMENT_PANED, EAttachmentPanedPrivate); + paned->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + paned, E_TYPE_ATTACHMENT_PANED, EAttachmentPanedPrivate); paned->priv->model = e_attachment_store_new (); /* Keep the expander label and combo box the same height. */ diff --git a/widgets/misc/e-attachment-store.c b/widgets/misc/e-attachment-store.c index e1794d653c..696e092b1c 100644 --- a/widgets/misc/e-attachment-store.c +++ b/widgets/misc/e-attachment-store.c @@ -218,7 +218,8 @@ e_attachment_store_init (EAttachmentStore *store) (GDestroyNotify) g_object_unref, (GDestroyNotify) gtk_tree_row_reference_free); - store->priv = G_TYPE_INSTANCE_GET_PRIVATE (store, E_TYPE_ATTACHMENT_STORE, EAttachmentStorePrivate); + store->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + store, E_TYPE_ATTACHMENT_STORE, EAttachmentStorePrivate); store->priv->attachment_index = attachment_index; types[column++] = E_TYPE_ATTACHMENT; /* COLUMN_ATTACHMENT */ diff --git a/widgets/misc/e-attachment-tree-view.c b/widgets/misc/e-attachment-tree-view.c index d3c3e68262..7099a7eb5b 100644 --- a/widgets/misc/e-attachment-tree-view.c +++ b/widgets/misc/e-attachment-tree-view.c @@ -504,7 +504,9 @@ e_attachment_tree_view_init (EAttachmentTreeView *tree_view) GtkTreeViewColumn *column; GtkCellRenderer *renderer; - tree_view->priv = G_TYPE_INSTANCE_GET_PRIVATE (tree_view, E_TYPE_ATTACHMENT_TREE_VIEW, EAttachmentTreeViewPrivate); + tree_view->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + tree_view, E_TYPE_ATTACHMENT_TREE_VIEW, + EAttachmentTreeViewPrivate); e_attachment_view_init (E_ATTACHMENT_VIEW (tree_view)); diff --git a/widgets/misc/e-attachment.c b/widgets/misc/e-attachment.c index 2c219a79ce..104ad5c002 100644 --- a/widgets/misc/e-attachment.c +++ b/widgets/misc/e-attachment.c @@ -877,7 +877,8 @@ e_attachment_class_init (EAttachmentClass *class) static void e_attachment_init (EAttachment *attachment) { - attachment->priv = G_TYPE_INSTANCE_GET_PRIVATE (attachment, E_TYPE_ATTACHMENT, EAttachmentPrivate); + attachment->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + attachment, E_TYPE_ATTACHMENT, EAttachmentPrivate); attachment->priv->cancellable = g_cancellable_new (); attachment->priv->encrypted = CAMEL_CIPHER_VALIDITY_ENCRYPT_NONE; attachment->priv->signed_ = CAMEL_CIPHER_VALIDITY_SIGN_NONE; diff --git a/widgets/misc/e-charset-combo-box.c b/widgets/misc/e-charset-combo-box.c index 57d958b082..aecee9b973 100644 --- a/widgets/misc/e-charset-combo-box.c +++ b/widgets/misc/e-charset-combo-box.c @@ -308,7 +308,8 @@ e_charset_combo_box_init (ECharsetComboBox *combo_box) (GDestroyNotify) g_free, (GDestroyNotify) g_object_unref); - combo_box->priv = G_TYPE_INSTANCE_GET_PRIVATE (combo_box, E_TYPE_CHARSET_COMBO_BOX, ECharsetComboBoxPrivate); + combo_box->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + combo_box, E_TYPE_CHARSET_COMBO_BOX, ECharsetComboBoxPrivate); combo_box->priv->action_group = action_group; combo_box->priv->charset_index = charset_index; diff --git a/widgets/misc/e-dateedit.c b/widgets/misc/e-dateedit.c index b57849c131..4e704bd39a 100644 --- a/widgets/misc/e-dateedit.c +++ b/widgets/misc/e-dateedit.c @@ -451,7 +451,8 @@ e_date_edit_class_init (EDateEditClass *class) static void e_date_edit_init (EDateEdit *dedit) { - dedit->priv = G_TYPE_INSTANCE_GET_PRIVATE (dedit, E_TYPE_DATE_EDIT, EDateEditPrivate); + dedit->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + dedit, E_TYPE_DATE_EDIT, EDateEditPrivate); dedit->priv->show_date = TRUE; dedit->priv->show_time = TRUE; diff --git a/widgets/misc/e-focus-tracker.c b/widgets/misc/e-focus-tracker.c index 91dc7be524..ac4eaf3d21 100644 --- a/widgets/misc/e-focus-tracker.c +++ b/widgets/misc/e-focus-tracker.c @@ -535,7 +535,8 @@ e_focus_tracker_init (EFocusTracker *focus_tracker) { GtkAction *action; - focus_tracker->priv = G_TYPE_INSTANCE_GET_PRIVATE (focus_tracker, E_TYPE_FOCUS_TRACKER, EFocusTrackerPrivate); + focus_tracker->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + focus_tracker, E_TYPE_FOCUS_TRACKER, EFocusTrackerPrivate); /* Define dummy actions. These will most likely be overridden, * but for cases where they're not it ensures ESelectable objects diff --git a/widgets/misc/e-hinted-entry.c b/widgets/misc/e-hinted-entry.c index a1679807a9..4885896762 100644 --- a/widgets/misc/e-hinted-entry.c +++ b/widgets/misc/e-hinted-entry.c @@ -210,7 +210,8 @@ e_hinted_entry_class_init (EHintedEntryClass *class) static void e_hinted_entry_init (EHintedEntry *entry) { - entry->priv = G_TYPE_INSTANCE_GET_PRIVATE (entry, E_TYPE_HINTED_ENTRY, EHintedEntryPrivate); + entry->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + entry, E_TYPE_HINTED_ENTRY, EHintedEntryPrivate); entry->priv->hint = g_strdup (""); /* hint must never be NULL */ hinted_entry_show_hint (entry); } diff --git a/widgets/misc/e-image-chooser.c b/widgets/misc/e-image-chooser.c index 4da38be9a9..3e9a976c18 100644 --- a/widgets/misc/e-image-chooser.c +++ b/widgets/misc/e-image-chooser.c @@ -440,7 +440,8 @@ e_image_chooser_init (EImageChooser *chooser) GtkWidget *container; GtkWidget *widget; - chooser->priv = G_TYPE_INSTANCE_GET_PRIVATE (chooser, E_TYPE_IMAGE_CHOOSER, EImageChooserPrivate); + chooser->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + chooser, E_TYPE_IMAGE_CHOOSER, EImageChooserPrivate); container = GTK_WIDGET (chooser); diff --git a/widgets/misc/e-import-assistant.c b/widgets/misc/e-import-assistant.c index 11059ebf1a..99c49ea32e 100644 --- a/widgets/misc/e-import-assistant.c +++ b/widgets/misc/e-import-assistant.c @@ -1356,7 +1356,9 @@ import_assistant_construct (EImportAssistant *import_assistant) static void e_import_assistant_init (EImportAssistant *import_assistant) { - import_assistant->priv = G_TYPE_INSTANCE_GET_PRIVATE (import_assistant, E_TYPE_IMPORT_ASSISTANT, EImportAssistantPrivate); + import_assistant->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + import_assistant, E_TYPE_IMPORT_ASSISTANT, + EImportAssistantPrivate); } GtkWidget * diff --git a/widgets/misc/e-online-button.c b/widgets/misc/e-online-button.c index 643ebc418a..2b974f9d4c 100644 --- a/widgets/misc/e-online-button.c +++ b/widgets/misc/e-online-button.c @@ -137,7 +137,8 @@ e_online_button_init (EOnlineButton *button) { GtkWidget *widget; - button->priv = G_TYPE_INSTANCE_GET_PRIVATE (button, E_TYPE_ONLINE_BUTTON, EOnlineButtonPrivate); + button->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + button, E_TYPE_ONLINE_BUTTON, EOnlineButtonPrivate); gtk_widget_set_can_focus (GTK_WIDGET (button), FALSE); gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE); diff --git a/widgets/misc/e-paned.c b/widgets/misc/e-paned.c index f184244203..6740d443b7 100644 --- a/widgets/misc/e-paned.c +++ b/widgets/misc/e-paned.c @@ -347,7 +347,8 @@ e_paned_class_init (EPanedClass *class) static void e_paned_init (EPaned *paned) { - paned->priv = G_TYPE_INSTANCE_GET_PRIVATE (paned, E_TYPE_PANED, EPanedPrivate); + paned->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + paned, E_TYPE_PANED, EPanedPrivate); paned->priv->proportion = 0.5; paned->priv->fixed_resize = TRUE; diff --git a/widgets/misc/e-picture-gallery.c b/widgets/misc/e-picture-gallery.c index dcbbe61c09..b4eabe48f3 100644 --- a/widgets/misc/e-picture-gallery.c +++ b/widgets/misc/e-picture-gallery.c @@ -402,7 +402,8 @@ e_picture_gallery_class_init (EPictureGalleryClass *class) static void e_picture_gallery_init (EPictureGallery *gallery) { - gallery->priv = G_TYPE_INSTANCE_GET_PRIVATE (gallery, E_TYPE_PICTURE_GALLERY, EPictureGalleryPrivate); + gallery->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + gallery, E_TYPE_PICTURE_GALLERY, EPictureGalleryPrivate); gallery->priv->initialized = FALSE; gallery->priv->monitor = NULL; picture_gallery_set_path (gallery, NULL); diff --git a/widgets/misc/e-popup-action.c b/widgets/misc/e-popup-action.c index a27137c289..334a5127eb 100644 --- a/widgets/misc/e-popup-action.c +++ b/widgets/misc/e-popup-action.c @@ -330,7 +330,8 @@ e_popup_action_class_init (EPopupActionClass *class) static void e_popup_action_init (EPopupAction *popup_action) { - popup_action->priv = G_TYPE_INSTANCE_GET_PRIVATE (popup_action, E_TYPE_POPUP_ACTION, EPopupActionPrivate); + popup_action->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + popup_action, E_TYPE_POPUP_ACTION, EPopupActionPrivate); popup_action->priv->use_action_appearance = TRUE; /* Remain invisible until we have a related action. */ diff --git a/widgets/misc/e-preferences-window.c b/widgets/misc/e-preferences-window.c index 7c58061642..49ce727cd2 100644 --- a/widgets/misc/e-preferences-window.c +++ b/widgets/misc/e-preferences-window.c @@ -254,7 +254,8 @@ e_preferences_window_init (EPreferencesWindow *window) (GDestroyNotify) g_free, (GDestroyNotify) gtk_tree_row_reference_free); - window->priv = G_TYPE_INSTANCE_GET_PRIVATE (window, E_TYPE_PREFERENCES_WINDOW, EPreferencesWindowPrivate); + window->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + window, E_TYPE_PREFERENCES_WINDOW, EPreferencesWindowPrivate); window->priv->index = index; window->priv->filter_view = NULL; diff --git a/widgets/misc/e-preview-pane.c b/widgets/misc/e-preview-pane.c index b65d1a79ff..5ae99916de 100644 --- a/widgets/misc/e-preview-pane.c +++ b/widgets/misc/e-preview-pane.c @@ -211,7 +211,8 @@ e_preview_pane_class_init (EPreviewPaneClass *class) static void e_preview_pane_init (EPreviewPane *preview_pane) { - preview_pane->priv = G_TYPE_INSTANCE_GET_PRIVATE (preview_pane, E_TYPE_PREVIEW_PANE, EPreviewPanePrivate); + preview_pane->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + preview_pane, E_TYPE_PREVIEW_PANE, EPreviewPanePrivate); gtk_box_set_spacing (GTK_BOX (preview_pane), 1); } diff --git a/widgets/misc/e-search-bar.c b/widgets/misc/e-search-bar.c index 0f83fd9683..f4709d1e76 100644 --- a/widgets/misc/e-search-bar.c +++ b/widgets/misc/e-search-bar.c @@ -531,7 +531,8 @@ e_search_bar_init (ESearchBar *search_bar) GtkWidget *widget; GtkWidget *container; - search_bar->priv = G_TYPE_INSTANCE_GET_PRIVATE (search_bar, E_TYPE_SEARCH_BAR, ESearchBarPrivate); + search_bar->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + search_bar, E_TYPE_SEARCH_BAR, ESearchBarPrivate); search_bar->priv->tokenizer = e_searching_tokenizer_new (); g_signal_connect_swapped ( diff --git a/widgets/misc/e-searching-tokenizer.c b/widgets/misc/e-searching-tokenizer.c index 087551fc76..3e7cb7f1dd 100644 --- a/widgets/misc/e-searching-tokenizer.c +++ b/widgets/misc/e-searching-tokenizer.c @@ -1080,7 +1080,9 @@ e_searching_tokenizer_class_init (ESearchingTokenizerClass *class) static void e_searching_tokenizer_init (ESearchingTokenizer *tokenizer) { - tokenizer->priv = G_TYPE_INSTANCE_GET_PRIVATE (tokenizer, E_TYPE_SEARCHING_TOKENIZER, ESearchingTokenizerPrivate); + tokenizer->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + tokenizer, E_TYPE_SEARCHING_TOKENIZER, + ESearchingTokenizerPrivate); tokenizer->priv->primary = search_info_new (); search_info_set_flags ( diff --git a/widgets/misc/e-signature-combo-box.c b/widgets/misc/e-signature-combo-box.c index 63d0b53a8a..9f3b6d9f99 100644 --- a/widgets/misc/e-signature-combo-box.c +++ b/widgets/misc/e-signature-combo-box.c @@ -219,7 +219,9 @@ e_signature_combo_box_init (ESignatureComboBox *combo_box) (GDestroyNotify) g_object_unref, (GDestroyNotify) gtk_tree_row_reference_free); - combo_box->priv = G_TYPE_INSTANCE_GET_PRIVATE (combo_box, E_TYPE_SIGNATURE_COMBO_BOX, ESignatureComboBoxPrivate); + combo_box->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + combo_box, E_TYPE_SIGNATURE_COMBO_BOX, + ESignatureComboBoxPrivate); combo_box->priv->index = index; } diff --git a/widgets/misc/e-signature-editor.c b/widgets/misc/e-signature-editor.c index 30f432d637..82d88ec7ae 100644 --- a/widgets/misc/e-signature-editor.c +++ b/widgets/misc/e-signature-editor.c @@ -396,7 +396,8 @@ e_signature_editor_init (ESignatureEditor *editor) GtkWidget *vbox; GError *error = NULL; - editor->priv = G_TYPE_INSTANCE_GET_PRIVATE (editor, E_TYPE_SIGNATURE_EDITOR, ESignatureEditorPrivate); + editor->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + editor, E_TYPE_SIGNATURE_EDITOR, ESignatureEditorPrivate); vbox = GTKHTML_EDITOR (editor)->vbox; gtkhtml_editor = GTKHTML_EDITOR (editor); diff --git a/widgets/misc/e-signature-manager.c b/widgets/misc/e-signature-manager.c index f5c7dd21fb..3da2312cec 100644 --- a/widgets/misc/e-signature-manager.c +++ b/widgets/misc/e-signature-manager.c @@ -501,7 +501,8 @@ e_signature_manager_init (ESignatureManager *manager) GtkWidget *container; GtkWidget *widget; - manager->priv = G_TYPE_INSTANCE_GET_PRIVATE (manager, E_TYPE_SIGNATURE_MANAGER, ESignatureManagerPrivate); + manager->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + manager, E_TYPE_SIGNATURE_MANAGER, ESignatureManagerPrivate); gtk_table_resize (GTK_TABLE (manager), 1, 2); gtk_table_set_col_spacings (GTK_TABLE (manager), 6); diff --git a/widgets/misc/e-signature-preview.c b/widgets/misc/e-signature-preview.c index ec4370bbc3..2ccb14bbaa 100644 --- a/widgets/misc/e-signature-preview.c +++ b/widgets/misc/e-signature-preview.c @@ -211,7 +211,8 @@ e_signature_preview_class_init (ESignaturePreviewClass *class) static void e_signature_preview_init (ESignaturePreview *preview) { - preview->priv = G_TYPE_INSTANCE_GET_PRIVATE (preview, E_TYPE_SIGNATURE_PREVIEW, ESignaturePreviewPrivate); + preview->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + preview, E_TYPE_SIGNATURE_PREVIEW, ESignaturePreviewPrivate); } GtkWidget * diff --git a/widgets/misc/e-signature-script-dialog.c b/widgets/misc/e-signature-script-dialog.c index 1977526db1..367cc94e13 100644 --- a/widgets/misc/e-signature-script-dialog.c +++ b/widgets/misc/e-signature-script-dialog.c @@ -226,7 +226,9 @@ e_signature_script_dialog_init (ESignatureScriptDialog *dialog) GtkWidget *widget; gchar *markup; - dialog->priv = G_TYPE_INSTANCE_GET_PRIVATE (dialog, E_TYPE_SIGNATURE_SCRIPT_DIALOG, ESignatureScriptDialogPrivate); + dialog->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + dialog, E_TYPE_SIGNATURE_SCRIPT_DIALOG, + ESignatureScriptDialogPrivate); content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); diff --git a/widgets/misc/e-signature-tree-view.c b/widgets/misc/e-signature-tree-view.c index 0c8cd626f9..82346755d2 100644 --- a/widgets/misc/e-signature-tree-view.c +++ b/widgets/misc/e-signature-tree-view.c @@ -296,7 +296,9 @@ e_signature_tree_view_init (ESignatureTreeView *tree_view) (GDestroyNotify) g_object_unref, (GDestroyNotify) gtk_tree_row_reference_free); - tree_view->priv = G_TYPE_INSTANCE_GET_PRIVATE (tree_view, E_TYPE_SIGNATURE_TREE_VIEW, ESignatureTreeViewPrivate); + tree_view->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + tree_view, E_TYPE_SIGNATURE_TREE_VIEW, + ESignatureTreeViewPrivate); tree_view->priv->index = index; selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (tree_view)); diff --git a/widgets/misc/e-web-view-preview.c b/widgets/misc/e-web-view-preview.c index 8e44db729f..d53bdf47d2 100644 --- a/widgets/misc/e-web-view-preview.c +++ b/widgets/misc/e-web-view-preview.c @@ -169,7 +169,8 @@ e_web_view_preview_init (EWebViewPreview *preview) { GtkWidget *tree_view_sw, *web_view_sw; - preview->priv = G_TYPE_INSTANCE_GET_PRIVATE (preview, E_TYPE_WEB_VIEW_PREVIEW, EWebViewPreviewPrivate); + preview->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + preview, E_TYPE_WEB_VIEW_PREVIEW, EWebViewPreviewPrivate); preview->priv->escape_values = TRUE; tree_view_sw = in_scrolled_window (gtk_tree_view_new ()); diff --git a/widgets/misc/e-web-view.c b/widgets/misc/e-web-view.c index 0e90d7dff9..7b46a63297 100644 --- a/widgets/misc/e-web-view.c +++ b/widgets/misc/e-web-view.c @@ -1374,7 +1374,8 @@ e_web_view_init (EWebView *web_view) const gchar *id; GError *error = NULL; - web_view->priv = G_TYPE_INSTANCE_GET_PRIVATE (web_view, E_TYPE_WEB_VIEW, EWebViewPrivate); + web_view->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + web_view, E_TYPE_WEB_VIEW, EWebViewPrivate); ui_manager = gtk_ui_manager_new (); web_view->priv->ui_manager = ui_manager; diff --git a/widgets/table/e-cell-toggle.c b/widgets/table/e-cell-toggle.c index 3d514c40e4..3d4f453820 100644 --- a/widgets/table/e-cell-toggle.c +++ b/widgets/table/e-cell-toggle.c @@ -386,7 +386,8 @@ e_cell_toggle_class_init (ECellToggleClass *class) static void e_cell_toggle_init (ECellToggle *cell_toggle) { - cell_toggle->priv = G_TYPE_INSTANCE_GET_PRIVATE (cell_toggle, E_TYPE_CELL_TOGGLE, ECellTogglePrivate); + cell_toggle->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + cell_toggle, E_TYPE_CELL_TOGGLE, ECellTogglePrivate); cell_toggle->priv->empty = gdk_pixbuf_new_from_xpm_data (empty_xpm); diff --git a/widgets/table/e-table-extras.c b/widgets/table/e-table-extras.c index c2fc291c3a..db18a8cf9e 100644 --- a/widgets/table/e-table-extras.c +++ b/widgets/table/e-table-extras.c @@ -230,7 +230,8 @@ ete_init (ETableExtras *extras) { ECell *cell, *sub_cell; - extras->priv = G_TYPE_INSTANCE_GET_PRIVATE (extras, E_TYPE_TABLE_EXTRAS, ETableExtrasPrivate); + extras->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + extras, E_TYPE_TABLE_EXTRAS, ETableExtrasPrivate); extras->priv->cells = g_hash_table_new_full ( g_str_hash, g_str_equal, diff --git a/widgets/table/e-table-memory-store.c b/widgets/table/e-table-memory-store.c index 37816c8a18..4cfd97e41c 100644 --- a/widgets/table/e-table-memory-store.c +++ b/widgets/table/e-table-memory-store.c @@ -240,7 +240,8 @@ etms_finalize (GObject *object) static void e_table_memory_store_init (ETableMemoryStore *etms) { - etms->priv = G_TYPE_INSTANCE_GET_PRIVATE (etms, E_TYPE_TABLE_MEMORY_STORE, ETableMemoryStorePrivate); + etms->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + etms, E_TYPE_TABLE_MEMORY_STORE, ETableMemoryStorePrivate); } static void diff --git a/widgets/table/e-table-memory.c b/widgets/table/e-table-memory.c index d55aa04b51..166cfdb1e1 100644 --- a/widgets/table/e-table-memory.c +++ b/widgets/table/e-table-memory.c @@ -84,7 +84,8 @@ e_table_memory_class_init (ETableMemoryClass *class) static void e_table_memory_init (ETableMemory *etmm) { - etmm->priv = G_TYPE_INSTANCE_GET_PRIVATE (etmm, E_TYPE_TABLE_MEMORY, ETableMemoryPrivate); + etmm->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + etmm, E_TYPE_TABLE_MEMORY, ETableMemoryPrivate); } /** diff --git a/widgets/table/e-table-search.c b/widgets/table/e-table-search.c index 23e8cdf002..538dcc4f1a 100644 --- a/widgets/table/e-table-search.c +++ b/widgets/table/e-table-search.c @@ -153,7 +153,8 @@ e_table_search_class_init (ETableSearchClass *class) static void e_table_search_init (ETableSearch *ets) { - ets->priv = G_TYPE_INSTANCE_GET_PRIVATE (ets, E_TYPE_TABLE_SEARCH, ETableSearchPrivate); + ets->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + ets, E_TYPE_TABLE_SEARCH, ETableSearchPrivate); ets->priv->search_string = g_strdup (""); } diff --git a/widgets/table/e-table-without.c b/widgets/table/e-table-without.c index 54e733fdad..8a180efab1 100644 --- a/widgets/table/e-table-without.c +++ b/widgets/table/e-table-without.c @@ -248,7 +248,8 @@ etw_class_init (ETableWithoutClass *class) static void etw_init (ETableWithout *etw) { - etw->priv = G_TYPE_INSTANCE_GET_PRIVATE (etw, E_TYPE_TABLE_WITHOUT, ETableWithoutPrivate); + etw->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + etw, E_TYPE_TABLE_WITHOUT, ETableWithoutPrivate); } ETableModel * diff --git a/widgets/table/e-tree-memory.c b/widgets/table/e-tree-memory.c index 5c7b8f46d2..c32b7311bd 100644 --- a/widgets/table/e-tree-memory.c +++ b/widgets/table/e-tree-memory.c @@ -389,7 +389,8 @@ e_tree_memory_class_init (ETreeMemoryClass *class) static void e_tree_memory_init (ETreeMemory *etmm) { - etmm->priv = G_TYPE_INSTANCE_GET_PRIVATE (etmm, E_TYPE_TREE_MEMORY, ETreeMemoryPrivate); + etmm->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + etmm, E_TYPE_TREE_MEMORY, ETreeMemoryPrivate); } /** diff --git a/widgets/table/e-tree-selection-model.c b/widgets/table/e-tree-selection-model.c index 18ec388530..8644187b91 100644 --- a/widgets/table/e-tree-selection-model.c +++ b/widgets/table/e-tree-selection-model.c @@ -741,7 +741,8 @@ e_tree_selection_model_get_cursor (ETreeSelectionModel *etsm) static void e_tree_selection_model_init (ETreeSelectionModel *etsm) { - etsm->priv = G_TYPE_INSTANCE_GET_PRIVATE (etsm, E_TYPE_TREE_SELECTION_MODEL, ETreeSelectionModelPrivate); + etsm->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + etsm, E_TYPE_TREE_SELECTION_MODEL, ETreeSelectionModelPrivate); etsm->priv->paths = g_hash_table_new (NULL, NULL); etsm->priv->cursor_col = -1; diff --git a/widgets/table/e-tree-sorted.c b/widgets/table/e-tree-sorted.c index 5b5bc80f24..9abb6772b2 100644 --- a/widgets/table/e-tree-sorted.c +++ b/widgets/table/e-tree-sorted.c @@ -1203,7 +1203,8 @@ e_tree_sorted_class_init (ETreeSortedClass *class) static void e_tree_sorted_init (ETreeSorted *ets) { - ets->priv = G_TYPE_INSTANCE_GET_PRIVATE (ets, E_TYPE_TREE_SORTED, ETreeSortedPrivate); + ets->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + ets, E_TYPE_TREE_SORTED, ETreeSortedPrivate); } /** diff --git a/widgets/table/e-tree-table-adapter.c b/widgets/table/e-tree-table-adapter.c index bbeed6ee38..fe8f90f536 100644 --- a/widgets/table/e-tree-table-adapter.c +++ b/widgets/table/e-tree-table-adapter.c @@ -743,7 +743,8 @@ etta_class_init (ETreeTableAdapterClass *class) static void etta_init (ETreeTableAdapter *etta) { - etta->priv = G_TYPE_INSTANCE_GET_PRIVATE (etta, E_TYPE_TREE_TABLE_ADAPTER, ETreeTableAdapterPrivate); + etta->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + etta, E_TYPE_TREE_TABLE_ADAPTER, ETreeTableAdapterPrivate); etta->priv->root_visible = TRUE; etta->priv->remap_needed = TRUE; diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c index dfbc3ccdce..040881c857 100644 --- a/widgets/table/e-tree.c +++ b/widgets/table/e-tree.c @@ -581,7 +581,8 @@ e_tree_init (ETree *e_tree) gtk_table_set_homogeneous (GTK_TABLE (e_tree), FALSE); - e_tree->priv = G_TYPE_INSTANCE_GET_PRIVATE (e_tree, E_TYPE_TREE, ETreePrivate); + e_tree->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + e_tree, E_TYPE_TREE, ETreePrivate); e_tree->priv->alternating_row_colors = 1; e_tree->priv->horizontal_draw_grid = 1; |