diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2013-01-11 22:38:38 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2013-01-11 22:39:04 +0800 |
| commit | 6a79322ff6417808416b3ebb183011e49ab7d66c (patch) | |
| tree | cb06aa8c2a9bef0b770011231c362bdb357acb52 /e-util | |
| parent | 620089c784f6e3c3dc9ee605a5f8ce08de593aa2 (diff) | |
| download | gsoc2013-evolution-6a79322ff6417808416b3ebb183011e49ab7d66c.tar gsoc2013-evolution-6a79322ff6417808416b3ebb183011e49ab7d66c.tar.gz gsoc2013-evolution-6a79322ff6417808416b3ebb183011e49ab7d66c.tar.bz2 gsoc2013-evolution-6a79322ff6417808416b3ebb183011e49ab7d66c.tar.lz gsoc2013-evolution-6a79322ff6417808416b3ebb183011e49ab7d66c.tar.xz gsoc2013-evolution-6a79322ff6417808416b3ebb183011e49ab7d66c.tar.zst gsoc2013-evolution-6a79322ff6417808416b3ebb183011e49ab7d66c.zip | |
Reduce diff noise with webkit-composer branch.
Diffstat (limited to 'e-util')
| -rw-r--r-- | e-util/e-mail-signature-editor.c | 4 | ||||
| -rw-r--r-- | e-util/e-menu-tool-button.c | 4 | ||||
| -rw-r--r-- | e-util/e-spell-entry.c | 22 |
3 files changed, 15 insertions, 15 deletions
diff --git a/e-util/e-mail-signature-editor.c b/e-util/e-mail-signature-editor.c index 961edf14ca..de5337d923 100644 --- a/e-util/e-mail-signature-editor.c +++ b/e-util/e-mail-signature-editor.c @@ -586,9 +586,9 @@ mail_signature_editor_constructed (GObject *object) /* Set the focus appropriately. If this is a new signature, draw * the user's attention to the signature name entry. Otherwise go * straight to the editing area. */ - if (source == NULL) + if (source == NULL) { gtk_widget_grab_focus (editor->priv->entry); - else { + } else { GtkHTML *html; html = gtkhtml_editor_get_html (gtkhtml_editor); diff --git a/e-util/e-menu-tool-button.c b/e-util/e-menu-tool-button.c index c2a68d0c05..16340dc483 100644 --- a/e-util/e-menu-tool-button.c +++ b/e-util/e-menu-tool-button.c @@ -191,7 +191,9 @@ menu_tool_button_get_property (GObject *object, static void menu_tool_button_dispose (GObject *object) { - EMenuToolButtonPrivate *priv = E_MENU_TOOL_BUTTON (object)->priv; + EMenuToolButtonPrivate *priv; + + priv = E_MENU_TOOL_BUTTON_GET_PRIVATE (object); if (priv->prefer_item) { g_free (priv->prefer_item); diff --git a/e-util/e-spell-entry.c b/e-util/e-spell-entry.c index 56f7c14f8c..f9949c0bd7 100644 --- a/e-util/e-spell-entry.c +++ b/e-util/e-spell-entry.c @@ -330,7 +330,7 @@ replace_word (GtkWidget *menuitem, checker = g_object_get_data (G_OBJECT (menuitem), "spell-entry-checker"); - if (checker) + if (checker != NULL) gtkhtml_spell_checker_store_replacement (checker, oldword, -1, newword, -1); g_free (oldword); @@ -763,16 +763,15 @@ e_spell_entry_finalize (GObject *object) if (entry->priv->settings) g_object_unref (entry->priv->settings); - if (entry->priv->checkers) - g_slist_free_full (entry->priv->checkers, g_object_unref); + + g_slist_free_full (entry->priv->checkers, g_object_unref); + if (entry->priv->attr_list) pango_attr_list_unref (entry->priv->attr_list); - if (entry->priv->words) - g_strfreev (entry->priv->words); - if (entry->priv->word_starts) - g_free (entry->priv->word_starts); - if (entry->priv->word_ends) - g_free (entry->priv->word_ends); + + g_strfreev (entry->priv->words); + g_free (entry->priv->word_starts); + g_free (entry->priv->word_ends); G_OBJECT_CLASS (e_spell_entry_parent_class)->finalize (object); } @@ -844,7 +843,7 @@ e_spell_entry_set_languages (ESpellEntry *spell_entry, gboolean e_spell_entry_get_checking_enabled (ESpellEntry *spell_entry) { - g_return_val_if_fail (spell_entry != NULL, FALSE); + g_return_val_if_fail (E_IS_SPELL_ENTRY (spell_entry), FALSE); return spell_entry->priv->checking_enabled; } @@ -853,7 +852,7 @@ void e_spell_entry_set_checking_enabled (ESpellEntry *spell_entry, gboolean enable_checking) { - g_return_if_fail (spell_entry != NULL); + g_return_if_fail (E_IS_SPELL_ENTRY (spell_entry)); if (spell_entry->priv->checking_enabled == enable_checking) return; @@ -862,5 +861,4 @@ e_spell_entry_set_checking_enabled (ESpellEntry *spell_entry, spell_entry_recheck_all (spell_entry); g_object_notify (G_OBJECT (spell_entry), "checking-enabled"); - } |