replace gtk_text_insert with gtk_stext_insert; GTK_TEXT with GTK_STEXT

diff --git a/ChangeLog.claws b/ChangeLog.claws
index c09b287ccdcdd8866251c114428d5f72f7829365..3364e5688b03b356f8ad0298432570950849cb5b 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,13 @@
+2001-11-05 [alfons]    0.6.4claws26
+       
+       * README.claws
+               Claws -> Sylpheed (vice versa)
+
+       * src/compose.c
+               :%s/gtk_text/gtk_stext/g
+               :%s/GTK_TEXT/GTK_STEXT/g
+               (thanks to Jonathan Ware for spotting this)
+

 2001-11-04 [christoph] 0.6.4claws25
 
        * src/summaryview.c
 2001-11-04 [christoph] 0.6.4claws25
 
        * src/summaryview.c

diff --git a/README.claws b/README.claws
index 30db04bb4c61d7eb8ce5a38302bdaebb49f9c404..14d50b4cedf1d7c76df7ca40daa9ed1f8f2fd5c7 100644 (file)
--- a/README.claws
+++ b/README.claws
@@ -4,7 +4,9 @@ README.claws
 Summary:
 
 1. What is Sylpheed Claws?
 Summary:
 
 1. What is Sylpheed Claws?

-2. Switching to Claws
+2. Switching between Sylpheed Claws and Sylpheed
+   * From Sylpheed to Sylpheed Claws
+   * From Sylpheed Claws to Sylpheed

 3. Things Claws does different
    * auto address replacement in summary view
    * manual selection of MIME types for attachments
 3. Things Claws does different
    * auto address replacement in summary view
    * manual selection of MIME types for attachments


@@ -15,6 +17,9 @@ Summary:
    * spell checking (with installation instructions)
 4. How to contribute
 5. How to request features
    * spell checking (with installation instructions)
 4. How to contribute
 5. How to request features

+6. History
+
+

 
 1. What is Sylpheed Claws?
 --------------------------
 
 1. What is Sylpheed Claws?
 --------------------------


@@ -31,43 +36,62 @@ For brevity Sylpheed Claws is referred to as Claws, and Sylpheed as either
 Sylpheed or Main.
 
 
 Sylpheed or Main.
 
 

-2. Switching to Claws
----------------------

 
 

-From the user perspective Claws is just a fancy Sylpheed, so it uses the
-same sylpheed setting files located in ~/.sylpheed.
+2. Switching between Sylpheed Claws and Sylpheed
+------------------------------------------------
+
+  From Sylpheed to Sylpheed Claws      
+  -------------------------------
+
+  From the user perspective Claws is just a fancy Sylpheed, so it uses the
+  same sylpheed setting files located in ~/.sylpheed.

 
 

-It's always a good idea to back up all files in ~/.sylpheed in case
-you want to switch back to Sylpheed. (You don't have to backup the
-directories.)
+  It's always a good idea to back up all files in ~/.sylpheed in case
+  you want to switch back to Sylpheed. (You don't have to backup the
+  directories.)

 
 

-There are some things that frequently come up when switching to Claws:
+  There are some things that frequently come up when switching to Claws:

 
 
 
 

-* When replying, the original sender's text is not quoted anymore.
+  * When replying, the original sender's text is not quoted anymore.

 
 

-  Claws has a different quote format handler. Add either %Q or %q to the
-  quote format text. Also click the button "Description of symbols"
-  for more quotation symbols.
+    Claws has a different quote format handler. Add either %Q or %q to the
+    quote format text. Also click the button "Description of symbols"
+    for more quotation symbols.

 
 
 
 

-* Why does the advanced filtering system not work?
+  * Why does the advanced filtering system not work?

 
 

-  Claws uses the new filtering system as soon as you define a new rule for it.
-  Your old sylpheed filter rules will not be used. In subdirectory tools/ of
-  the distribution there is a Perl script called filter_conv.pl which convers
-  old filter rules to the claws filtering system.
+    Claws uses the new filtering system as soon as you define a new rule for it.
+    Your old sylpheed filter rules will not be used. In subdirectory tools/ of
+    the distribution there is a Perl script called filter_conv.pl which convers
+    old filter rules to the claws filtering system.

   
 
   
 

-* What happened to the compose email and compose news buttons? 
+  * What happened to the compose email and compose news buttons? 
+
+    There's a composite button for both composing mail and news. You can toggle
+    between composing mail and news by clicking on the button with the triangle.
+
+
+  * And to the Preferences and Execute buttons?
+
+    Sorry, they're not there.

 
 

-  There's a composite button for both composing mail and news. You can toggle
-  between composing mail and news by clicking on the button with the triangle.

 
 

+  From Sylpheed Claws to Sylpheed
+  -------------------------------

 
 

-* And to the Preferences and Execute buttons?
+  Moving from Claws to Sylpheed is also simple. Sylpheed should neglect the things
+  Claws put in the settings files. This also means that the old rules will work
+  again. 

 
 

-  Sorry, they're not there.
+  If you want to switch back to Claws at a later time, make sure you back up at least
+  ~/.sylpheed/filteringrc (the Claws filtering rules), and ~/.sylpheed/sylpheedrc 
+  (which may have some claws specific settings).
+
+  When switching back to Sylpheed you will not lose messages or message flags (color
+  labels, read / unread status of messages). 

 
 
 
 
 
 


@@ -236,6 +260,7 @@ There are a lot more options. If you find one, don't hesitate to
 mention it.
 
 
 mention it.
 
 

+

 4. How to contribute
 --------------------
 
 4. How to contribute
 --------------------
 


@@ -265,6 +290,7 @@ a long time to stabilize, send a mail to Paul Mangan. We can probably
 arrange access to the Claws branch.
 
 
 arrange access to the Claws branch.
 
 

+

 5. How to request features
 --------------------------
 
 5. How to request features
 --------------------------
 


@@ -275,3 +301,11 @@ and rejected for whatever reason.  You might want to go ahead and
 hack a patch for it. (That would be very cool!) Another
 possibility is to use the Feature Request Tracker at the
 sourceforge project page.
 hack a patch for it. (That would be very cool!) Another
 possibility is to use the Feature Request Tracker at the
 sourceforge project page.

+
+
+
+6. History
+----------
+
+TODO
+

diff --git a/configure.in b/configure.in
index 37422cf42509073c3868606519cb0204a799649b..15ca552ba55d07654a59dae781758b62bf586b8b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=6
 MICRO_VERSION=4
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=4
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=claws25
+EXTRA_VERSION=claws26

 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl

diff --git a/src/compose.c b/src/compose.c
index 4c51dc772bb1b130277e77bee6c77f13ddf6c1b3..24a3290dd4e92eda8d0249fb8e01054ab1bb13bc 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -567,10 +567,10 @@ static void set_compose_entries(Compose * compose, const gchar * mailto)
        if (bcc)
                compose_entry_append(compose, bcc, COMPOSE_BCC);
        if (body) {
        if (bcc)
                compose_entry_append(compose, bcc, COMPOSE_BCC);
        if (body) {

-               gtk_text_insert(GTK_TEXT(compose->text),
-                               NULL, NULL, NULL, body, -1);
-               gtk_text_insert(GTK_TEXT(compose->text),
-                               NULL, NULL, NULL, "\n", 1);
+               gtk_stext_insert(GTK_STEXT(compose->text),
+                                NULL, NULL, NULL, body, -1);
+               gtk_stext_insert(GTK_STEXT(compose->text),
+                                NULL, NULL, NULL, "\n", 1);

        }
 }      
 
        }
 }