diff options
author | Rodrigo Moya <rodrigo@gnome-db.org> | 2011-10-05 19:57:30 +0800 |
---|---|---|
committer | Rodrigo Moya <rodrigo@gnome-db.org> | 2011-10-05 19:57:30 +0800 |
commit | 4ec46cc05fcb94d181fb9c2412984a1446647c85 (patch) | |
tree | d16ce30e77dd539c03509237dd4c723d46aea97a /composer/e-composer-text-header.c | |
parent | 5ea7e23aef0c239af2600c95419ba0bda0f08b3c (diff) | |
parent | 19163c2b71e6128fc9b32287b99b1f4422324c2d (diff) | |
download | gsoc2013-evolution-4ec46cc05fcb94d181fb9c2412984a1446647c85.tar gsoc2013-evolution-4ec46cc05fcb94d181fb9c2412984a1446647c85.tar.gz gsoc2013-evolution-4ec46cc05fcb94d181fb9c2412984a1446647c85.tar.bz2 gsoc2013-evolution-4ec46cc05fcb94d181fb9c2412984a1446647c85.tar.lz gsoc2013-evolution-4ec46cc05fcb94d181fb9c2412984a1446647c85.tar.xz gsoc2013-evolution-4ec46cc05fcb94d181fb9c2412984a1446647c85.tar.zst gsoc2013-evolution-4ec46cc05fcb94d181fb9c2412984a1446647c85.zip |
Merge from master
Diffstat (limited to 'composer/e-composer-text-header.c')
-rw-r--r-- | composer/e-composer-text-header.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/composer/e-composer-text-header.c b/composer/e-composer-text-header.c index 28df51ec87..39279237ab 100644 --- a/composer/e-composer-text-header.c +++ b/composer/e-composer-text-header.c @@ -89,19 +89,19 @@ e_composer_text_header_init (EComposerTextHeader *header) EComposerHeader * e_composer_text_header_new_label (const gchar *label) { - return g_object_new (E_TYPE_COMPOSER_TEXT_HEADER, - "label", label, - "button", FALSE, - NULL); + return g_object_new ( + E_TYPE_COMPOSER_TEXT_HEADER, + "label", label, "button", FALSE, + NULL); } EComposerHeader * e_composer_text_header_new_button (const gchar *label) { - return g_object_new (E_TYPE_COMPOSER_TEXT_HEADER, - "label", label, - "button", TRUE, - NULL); + return g_object_new ( + E_TYPE_COMPOSER_TEXT_HEADER, + "label", label, "button", TRUE, + NULL); } const gchar * @@ -112,6 +112,7 @@ e_composer_text_header_get_text (EComposerTextHeader *header) g_return_val_if_fail (E_IS_COMPOSER_TEXT_HEADER (header), NULL); entry = E_COMPOSER_TEXT_HEADER_GET_ENTRY (header); + return gtk_entry_get_text (entry); } @@ -124,5 +125,6 @@ e_composer_text_header_set_text (EComposerTextHeader *header, g_return_if_fail (E_IS_COMPOSER_TEXT_HEADER (header)); entry = E_COMPOSER_TEXT_HEADER_GET_ENTRY (header); + gtk_entry_set_text (entry, (text != NULL) ? text : ""); } |