From 0559db3959b2968315f63fcbcbfc5c6d873d5e1e Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Mon, 31 Mar 2003 22:14:51 +0000 Subject: Convert to libglade-2's format. 2003-03-31 Jeffrey Stedfast * e-msg-composer-attachment.glade: Convert to libglade-2's format. * e-msg-composer.c (set_editor_signature): E_MSG_COMPOSER_HDRS (composer->hdrs)->account->id can never be NULL anymore. svn path=/trunk/; revision=20604 --- composer/ChangeLog | 7 + composer/e-msg-composer-attachment.glade | 523 +++++++++++++++---------------- composer/e-msg-composer.c | 29 +- 3 files changed, 266 insertions(+), 293 deletions(-) diff --git a/composer/ChangeLog b/composer/ChangeLog index 85d63ddba8..d3be02a563 100644 --- a/composer/ChangeLog +++ b/composer/ChangeLog @@ -1,3 +1,10 @@ +2003-03-31 Jeffrey Stedfast + + * e-msg-composer-attachment.glade: Convert to libglade-2's format. + + * e-msg-composer.c (set_editor_signature): E_MSG_COMPOSER_HDRS + (composer->hdrs)->account->id can never be NULL anymore. + 2003-03-25 Dan Winship * e-msg-composer.c: Update for e_notice move diff --git a/composer/e-msg-composer-attachment.glade b/composer/e-msg-composer-attachment.glade index 5b585e2d5c..a67342bb47 100644 --- a/composer/e-msg-composer-attachment.glade +++ b/composer/e-msg-composer-attachment.glade @@ -1,280 +1,247 @@ - - - - - e-msg-composer-attachment - e-msg-composer-attachment - - src - pixmaps - C - True - True - False - - - - GnomeDialog - dialog - Attachment properties - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - False - False - False - False - False - - - GtkVBox - GnomeDialog:vbox - dialog-vbox1 - False - 8 - - 4 - True - True - - - - GtkHButtonBox - GnomeDialog:action_area - dialog-action_area1 - GTK_BUTTONBOX_END - 8 - 85 - 27 - 7 - 0 - - 0 - False - True - GTK_PACK_END - - - - GtkButton - ok_button - True - True - True - GNOME_STOCK_BUTTON_OK - - - - GtkButton - close_button - True - True - GNOME_STOCK_BUTTON_CANCEL - - - - - GtkTable - table1 - 4 - 2 - False - 10 - 5 - - 0 - True - True - - - - GtkEntry - description_entry - True - True - True - 0 - - - 1 - 2 - 1 - 2 - 0 - 0 - True - False - False - False - True - False - - - - - GtkHBox - hbox3 - False - 10 - - 1 - 2 - 0 - 1 - 0 - 0 - True - True - True - True - True - True - - - - GtkEntry - file_name_entry - 290 - True - True - True - 0 - - - 0 - True - True - - - - - - GtkEntry - mime_type_entry - False - True - False - True - 0 - - - 1 - 2 - 2 - 3 - 0 - 0 - True - False - False - False - True - False - - - - - GtkLabel - mime_label - - GTK_JUSTIFY_LEFT - False - 1 - 0.5 - 0 - 0 - - 0 - 1 - 2 - 3 - 0 - 0 - False - False - False - False - True - False - - - - - GtkLabel - description_label - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 0 - 0 - - 0 - 1 - 1 - 2 - 0 - 0 - False - False - False - False - True - False - + + + + + + Attachment properties + GTK_WINDOW_TOPLEVEL + no + no + no + yes + GTK_WIN_POS_NONE + + + + no + 8 + yes + + + + GTK_BUTTONBOX_END + 8 + yes + + + + yes + yes + yes + yes + gtk-ok + yes + yes + + + + + + yes + yes + yes + gtk-cancel + yes + yes + + + + + 0 + no + yes + GTK_PACK_END + + + + + + no + 10 + 5 + 4 + 2 + yes + + + + yes + yes + + 0 + yes + yes + + + 1 + 2 + 1 + 2 + 0 + 0 + expand|fill + + + + + + + no + 10 + yes + + + + yes + yes + + 290 + 0 + yes + yes + + + 0 + yes + yes + + + + + 1 + 2 + 0 + 1 + 0 + 0 + expand|shrink|fill + expand|shrink|fill + + + + + + no + yes + no + + 0 + yes + yes + + + 1 + 2 + 2 + 3 + 0 + 0 + expand|fill + + + + + + + MIME type: + GTK_JUSTIFY_LEFT + no + 1 + 0.5 + 0 + 0 + yes + + + 0 + 1 + 2 + 3 + 0 + 0 + fill + + + + + + + Description: + GTK_JUSTIFY_CENTER + no + 1 + 0.5 + 0 + 0 + yes + + + 0 + 1 + 1 + 2 + 0 + 0 + fill + + + + + + + File name: + GTK_JUSTIFY_CENTER + no + 1 + 0.5 + 0 + 0 + yes + + + 0 + 1 + 0 + 1 + 0 + 0 + fill + + + + + + + yes + Suggest automatic display of attachment + no + yes + yes + + + 0 + 2 + 3 + 4 + 0 + 0 + fill + + + + + + 0 + yes + yes + + - - - GtkLabel - filename_label - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 0 - 0 - - 0 - 1 - 0 - 1 - 0 - 0 - False - False - False - False - True - False - - - - - GtkCheckButton - disposition_checkbox - True - - False - True - - 0 - 2 - 3 - 4 - 0 - 0 - False - False - False - False - True - False - - - + + 4 + yes + yes + + - - - + diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c index 7c660eb08a..5c649e9a6c 100644 --- a/composer/e-msg-composer.c +++ b/composer/e-msg-composer.c @@ -2894,22 +2894,21 @@ create_composer (int visible_mask) static void set_editor_signature (EMsgComposer *composer) { + EAccountIdentity *id; + GSList *signatures; + /* printf ("set_editor_signature\n"); */ - if (E_MSG_COMPOSER_HDRS (composer->hdrs)->account->id) { - EAccountIdentity *id; - GSList *signatures; - - id = E_MSG_COMPOSER_HDRS (composer->hdrs)->account->id; - - signatures = mail_config_get_signature_list (); - - composer->signature = g_slist_nth_data (signatures, id->def_signature); - composer->auto_signature = id->auto_signature; - - /* printf ("auto: %d\n", id->auto_signature); */ - - sig_select_item (composer); - } + id = E_MSG_COMPOSER_HDRS (composer->hdrs)->account->id; + + signatures = mail_config_get_signature_list (); + + composer->signature = g_slist_nth_data (signatures, id->def_signature); + composer->auto_signature = id->auto_signature; + + /* printf ("auto: %d\n", id->auto_signature); */ + + sig_select_item (composer); + /* printf ("set_editor_signature end\n"); */ } -- cgit * Update to 1.24.0sunpoet2019-08-202-4/+4 * Update to 1.0.6sunpoet2019-08-202-4/+4 * Allow concurrent installation (USE_PYTHON=concurrent)sunpoet2019-08-201-1/+1 * Update to 0.28.0sunpoet2019-08-202-5/+7 * Update to 0.008sunpoet2019-08-202-4/+6 * Update to 1.52sunpoet2019-08-202-4/+4 * Update to 0.2.4sunpoet2019-08-202-4/+4 * Update to 0.000124sunpoet2019-08-203-5/+4 * Update to 0.001084sunpoet2019-08-203-7/+7 * Update to 0.519sunpoet2019-08-202-5/+6 * Update to 0.98sunpoet2019-08-202-4/+4 * Update to 5.0.14sunpoet2019-08-202-4/+4 * Update to 12.5.1sunpoet2019-08-203-4/+6 * Update to 0.7.1sunpoet2019-08-203-5/+5 * Fix bison warningsunpoet2019-08-201-0/+11 * Add rubygem-cloudflare 4.1.3sunpoet2019-08-204-0/+30 * devel/nspr: update to 4.22jbeich2019-08-204-204/+154 * Add rubygem-async-rest 0.10.1sunpoet2019-08-204-0/+36 * Add rubygem-async-http 0.48.2sunpoet2019-08-204-0/+33 * Add rubygem-protocol-http2 0.9.5sunpoet2019-08-204-0/+29 * Add rubygem-protocol-http1 0.9.0sunpoet2019-08-204-0/+28 * Add rubygem-protocol-http 0.12.1sunpoet2019-08-204-0/+26 * Add rubygem-protocol-hpack 1.4.1sunpoet2019-08-204-0/+27 * Add rubygem-google-cloud-logging 1.6.6sunpoet2019-08-204-0/+40 * Add rubygem-stackdriver-core 1.3.3sunpoet2019-08-204-0/+30 * Add rubygem-async-io 1.25.0sunpoet2019-08-204-0/+29 * Add rubygem-async 1.20.1sunpoet2019-08-204-0/+31 * Add rubygem-console 1.4.0sunpoet2019-08-204-0/+27 * Add rubygem-google-gax 1.7.0sunpoet2019-08-204-0/+39 * Add py-mypy-protobuf 1.15sunpoet2019-08-204-0/+33 * Add p5-Test2-Plugin-UUID 0.002001sunpoet2019-08-205-0/+40 * Add p5-Test2-Plugin-MemUsage 0.002001sunpoet2019-08-205-0/+38 * Add p5-Test2-Plugin-DBIProfile 0.002001sunpoet2019-08-205-0/+39 * databases/sqlitestudio: Fix symlinkyuri2019-08-201-2/+2 * databases/sqlitestudio: add the lowercase link to the executable for convenienceyuri2019-08-202-1/+4 * devel/git-cinnabar: rebuild and unbreak after r509301jbeich2019-08-202-1/+68 * net-mgmt/cacti: Update to 1.2.5kai2019-08-207-42/+81 * devel/gitlab-runner: update to 12.1.0swills2019-08-202-7/+7 * databases/sqlitestudio: Add the .desktop file and the icon.yuri2019-08-202-2/+17 * math/wxmaxima: Update to 19.08.1kai2019-08-203-10/+39 * - Update to 2.15.2amdmi32019-08-202-5/+4 * - Update to 1.72amdmi32019-08-203-4/+6 * New port: shells/starship: Cross-shell prompt for astronautsyuri2019-08-204-0/+403 * - Update to 4.0.3amdmi32019-08-202-9/+9 * - revive net/subnetcalcjgh2019-08-205-1/+37 * devel/git: Update to 2.23.0garga2019-08-203-10/+16 * graphics/libspiro: upgrade 0.5.20150702 -> 20190731pi2019-08-205-19/+24 * Update to 4.2.2joneum2019-08-202-5/+4 * Fix build of editors/calligraplan.adridg2019-08-201-0/+68 * multimedia/shotcut: update to 19.08.16fernape2019-08-203-4/+5 * devel/cargo-tree: Improve COMMENTyuri2019-08-201-1/+1 * . Update to 4.5.2glewis2019-08-202-4/+5 * New port: devel/cargo-tree: Rust subcommand to visualize a dependency graph i...yuri2019-08-204-0/+494 * Add dns/nsdjoneum2019-08-201-0/+28 * - Update to 2.5.3amdmi32019-08-193-19/+77 * devel/boost-*: update to 1.71.0jbeich2019-08-19