aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJP Rosevear <jpr@novell.com>2004-12-24 21:57:49 +0800
committerJP Rosevear <jpr@src.gnome.org>2004-12-24 21:57:49 +0800
commit3a53893a829d00746c2d51cd1397e54126a8b852 (patch)
treee11fa29e9c506e702c7b679c0ed727ac92f53680
parent6dde62e01d3804ea7d2254ab94268aaf315a2fed (diff)
downloadgsoc2013-evolution-3a53893a829d00746c2d51cd1397e54126a8b852.tar
gsoc2013-evolution-3a53893a829d00746c2d51cd1397e54126a8b852.tar.gz
gsoc2013-evolution-3a53893a829d00746c2d51cd1397e54126a8b852.tar.bz2
gsoc2013-evolution-3a53893a829d00746c2d51cd1397e54126a8b852.tar.lz
gsoc2013-evolution-3a53893a829d00746c2d51cd1397e54126a8b852.tar.xz
gsoc2013-evolution-3a53893a829d00746c2d51cd1397e54126a8b852.tar.zst
gsoc2013-evolution-3a53893a829d00746c2d51cd1397e54126a8b852.zip
kill warnings (map_default_cb): the to entry widget is now just a gtk
2004-12-24 JP Rosevear <jpr@novell.com> * e-msg-composer.c (setup_signatures_menu): kill warnings (map_default_cb): the to entry widget is now just a gtk entry at its core, so check for text that way svn path=/trunk/; revision=28201
-rw-r--r--composer/ChangeLog6
-rw-r--r--composer/e-msg-composer.c19
2 files changed, 12 insertions, 13 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog
index a310f095dc..c40d6d7a4c 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,9 @@
+2004-12-24 JP Rosevear <jpr@novell.com>
+
+ * e-msg-composer.c (setup_signatures_menu): kill warnings
+ (map_default_cb): the to entry widget is now just a gtk entry at
+ its core, so check for text that way
+
2004-12-23 Hans Petter Jansson <hpj@novell.com>
* Makefile.am (selectnamesdir)
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index 690193f4f8..5d22f1144e 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -2100,7 +2100,7 @@ setup_signatures_menu (EMsgComposer *composer)
composer->sig_menu = (GtkOptionMenu *) gtk_option_menu_new ();
- gtk_label_set_mnemonic_widget (label, composer->sig_menu);
+ gtk_label_set_mnemonic_widget ((GtkLabel *) label, (GtkWidget *)composer->sig_menu);
gtk_box_pack_end_defaults (GTK_BOX (hbox), (GtkWidget *) composer->sig_menu);
gtk_box_pack_end (GTK_BOX (hbox), label, FALSE, TRUE, 0);
@@ -3153,27 +3153,20 @@ static void
map_default_cb (EMsgComposer *composer, gpointer user_data)
{
GtkWidget *widget;
- BonoboControlFrame *cf;
- Bonobo_PropertyBag pb = CORBA_OBJECT_NIL;
CORBA_Environment ev;
const char *subject;
- char *text;
+ const char *text;
+
+ /* If the 'To:' field is empty, focus it */
- /* If the 'To:' field is empty, focus it (This is ridiculously complicated) */
-
widget = e_msg_composer_hdrs_get_to_entry (E_MSG_COMPOSER_HDRS (composer->hdrs));
- cf = bonobo_widget_get_control_frame (BONOBO_WIDGET (widget));
- pb = bonobo_control_frame_get_control_property_bag (cf, NULL);
- text = bonobo_pbclient_get_string (pb, "text", NULL);
- bonobo_object_release_unref (pb, NULL);
+ text = gtk_entry_get_text (GTK_ENTRY (widget));
if (!text || text[0] == '\0') {
- bonobo_control_frame_control_activate (cf);
+ gtk_widget_grab_focus (widget);
- g_free (text);
return;
}
- g_free (text);
/* If not, check the subject field */