diff options
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/ChangeLog | 9 | ||||
| -rw-r--r-- | mail/mail-config-druid.c | 21 | ||||
| -rw-r--r-- | mail/mail-config-druid.h | 1 | ||||
| -rw-r--r-- | mail/mail-config.glade | 64 |
4 files changed, 16 insertions, 79 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index a9f14d2d44..934add80d4 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,12 @@ +2001-01-12 Jeffrey Stedfast <fejj@ximian.com> + + * mail-config-druid.c (construct): We don't want to be able to set + the reply-to in the config druid. + (druid_finish): Don't set a reply-to anymore. + (mail_config_druid_finalise): Don't unref the providers. + + * mail-config.glade: Took out the Reply-To field in the druid. + 2001-01-11 Miguel de Icaza <miguel@gnu.org> * mail-config-druid.c (incoming_type_changed): Guess the default diff --git a/mail/mail-config-druid.c b/mail/mail-config-druid.c index a68f298969..aeb4509f43 100644 --- a/mail/mail-config-druid.c +++ b/mail/mail-config-druid.c @@ -91,16 +91,6 @@ static void mail_config_druid_finalise (GtkObject *obj) { MailConfigDruid *druid = (MailConfigDruid *) obj; - GList *l; - - l = druid->providers; - while (l) { - CamelProvider *provider = l->data; - - camel_object_unref (CAMEL_OBJECT (provider)); - l = l->next; - } - g_list_free (druid->providers); gtk_object_unref (GTK_OBJECT (druid->gui)); @@ -206,7 +196,6 @@ druid_finish (GnomeDruidPage *page, gpointer arg1, gpointer user_data) id = g_new0 (MailConfigIdentity, 1); id->name = mail_config_druid_get_full_name (druid); id->address = mail_config_druid_get_email_address (druid); - id->reply_to = mail_config_druid_get_reply_to (druid); id->organization = mail_config_druid_get_organization (druid); id->signature = mail_config_druid_get_sigfile (druid); @@ -938,7 +927,6 @@ construct (MailConfigDruid *druid) gtk_signal_connect (GTK_OBJECT (druid->full_name), "changed", identity_changed, druid); druid->email_address = GTK_ENTRY (glade_xml_get_widget (gui, "txtAddress")); gtk_signal_connect (GTK_OBJECT (druid->email_address), "changed", identity_changed, druid); - druid->reply_to = GTK_ENTRY (glade_xml_get_widget (gui, "txtReplyTo")); druid->organization = GTK_ENTRY (glade_xml_get_widget (gui, "txtOrganization")); druid->signature = GNOME_FILE_ENTRY (glade_xml_get_widget (gui, "fileSignature")); @@ -1020,15 +1008,6 @@ mail_config_druid_get_email_address (MailConfigDruid *druid) char * -mail_config_druid_get_reply_to (MailConfigDruid *druid) -{ - g_return_val_if_fail (IS_MAIL_CONFIG_DRUID (druid), NULL); - - return g_strdup (gtk_entry_get_text (druid->reply_to)); -} - - -char * mail_config_druid_get_organization (MailConfigDruid *druid) { g_return_val_if_fail (IS_MAIL_CONFIG_DRUID (druid), NULL); diff --git a/mail/mail-config-druid.h b/mail/mail-config-druid.h index 05b07391fd..9dc3d6dd8e 100644 --- a/mail/mail-config-druid.h +++ b/mail/mail-config-druid.h @@ -59,7 +59,6 @@ struct _MailConfigDruid { GtkWidget *identity_text; GtkEntry *full_name; GtkEntry *email_address; - GtkEntry *reply_to; GtkEntry *organization; GnomeFileEntry *signature; diff --git a/mail/mail-config.glade b/mail/mail-config.glade index c76e6ba74f..4cf3f88798 100644 --- a/mail/mail-config.glade +++ b/mail/mail-config.glade @@ -270,7 +270,7 @@ Click "Next" to begin. </text> <class>GtkTable</class> <name>table2</name> <border_width>4</border_width> - <rows>3</rows> + <rows>2</rows> <columns>2</columns> <homogeneous>False</homogeneous> <row_spacing>4</row_spacing> @@ -289,8 +289,8 @@ Click "Next" to begin. </text> <child> <left_attach>0</left_attach> <right_attach>1</right_attach> - <top_attach>1</top_attach> - <bottom_attach>2</bottom_attach> + <top_attach>0</top_attach> + <bottom_attach>1</bottom_attach> <xpad>0</xpad> <ypad>0</ypad> <xexpand>False</xexpand> @@ -315,8 +315,8 @@ Click "Next" to begin. </text> <child> <left_attach>0</left_attach> <right_attach>1</right_attach> - <top_attach>2</top_attach> - <bottom_attach>3</bottom_attach> + <top_attach>1</top_attach> + <bottom_attach>2</bottom_attach> <xpad>0</xpad> <ypad>0</ypad> <xexpand>False</xexpand> @@ -339,60 +339,10 @@ Click "Next" to begin. </text> <child> <left_attach>1</left_attach> <right_attach>2</right_attach> - <top_attach>1</top_attach> - <bottom_attach>2</bottom_attach> - <xpad>0</xpad> - <ypad>0</ypad> - <xexpand>True</xexpand> - <yexpand>False</yexpand> - <xshrink>False</xshrink> - <yshrink>False</yshrink> - <xfill>True</xfill> - <yfill>False</yfill> - </child> - </widget> - - <widget> - <class>GtkLabel</class> - <name>identity-reply-to-label</name> - <label>Reply-to:</label> - <justify>GTK_JUSTIFY_RIGHT</justify> - <wrap>True</wrap> - <xalign>1</xalign> - <yalign>0.5</yalign> - <xpad>0</xpad> - <ypad>0</ypad> - <child> - <left_attach>0</left_attach> - <right_attach>1</right_attach> <top_attach>0</top_attach> <bottom_attach>1</bottom_attach> <xpad>0</xpad> <ypad>0</ypad> - <xexpand>False</xexpand> - <yexpand>False</yexpand> - <xshrink>False</xshrink> - <yshrink>False</yshrink> - <xfill>True</xfill> - <yfill>False</yfill> - </child> - </widget> - - <widget> - <class>GtkEntry</class> - <name>txtReplyTo</name> - <can_focus>True</can_focus> - <editable>True</editable> - <text_visible>True</text_visible> - <text_max_length>0</text_max_length> - <text></text> - <child> - <left_attach>1</left_attach> - <right_attach>2</right_attach> - <top_attach>0</top_attach> - <bottom_attach>1</bottom_attach> - <xpad>1</xpad> - <ypad>0</ypad> <xexpand>True</xexpand> <yexpand>False</yexpand> <xshrink>False</xshrink> @@ -411,8 +361,8 @@ Click "Next" to begin. </text> <child> <left_attach>1</left_attach> <right_attach>2</right_attach> - <top_attach>2</top_attach> - <bottom_attach>3</bottom_attach> + <top_attach>1</top_attach> + <bottom_attach>2</bottom_attach> <xpad>0</xpad> <ypad>0</ypad> <xexpand>True</xexpand> |