remove code committed in error
authorPaul Mangan <paul@claws-mail.org>
Sun, 23 Jun 2002 07:49:25 +0000 (07:49 +0000)
committerPaul Mangan <paul@claws-mail.org>
Sun, 23 Jun 2002 07:49:25 +0000 (07:49 +0000)
ChangeLog.claws
configure.in
src/messageview.c
src/messageview.h

index e5c8fa71f46e68ad4df6dc268c5600689a01a7fc..d838b306991184b862c74c554e79a24e44493229 100644 (file)
@@ -1,3 +1,9 @@
+2002-06-23 [paul]      0.7.8claws17
+
+       * src/messageview.[ch]
+               remove code committed in error from locally patched
+               source
+
 2002-06-23 [colin]     0.7.8claws16
 
        * src/compose.[ch]
index a3331185f308caa87951e5348b2f6dc4012fec83..9cdc43a17c570dd55871a8ed6cd4ff6b3915b1ee 100644 (file)
@@ -8,7 +8,7 @@ MINOR_VERSION=7
 MICRO_VERSION=8
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws16
+EXTRA_VERSION=claws17
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
index 7248fff10ead3bb518e6b01d65226664cd2e4bb9..c38c725b00878f029c2afde2502ccd2fb4aa0bf2 100644 (file)
@@ -106,7 +106,6 @@ MessageView *messageview_create(void)
        messageview->textview   = textview;
        messageview->imageview  = imageview;
        messageview->mimeview   = mimeview;
-       messageview->plugview   = gtk_socket_new();
 
        return messageview;
 }
@@ -424,8 +423,8 @@ void messageview_show(MessageView *messageview, MsgInfo *msginfo,
        textview_set_all_headers(messageview->textview, all_headers);
        textview_set_all_headers(messageview->mimeview->textview, all_headers);
 
-       if (mimeinfo->mime_type != MIME_TEXT /*&&
-           mimeinfo->mime_type != MIME_TEXT_HTML*/) {
+       if (mimeinfo->mime_type != MIME_TEXT &&
+           mimeinfo->mime_type != MIME_TEXT_HTML) {
                messageview_change_view_type(messageview, MVIEW_MIME);
                mimeview_show_message(messageview->mimeview, mimeinfo, file);
        } else {
@@ -442,49 +441,24 @@ static void messageview_change_view_type(MessageView *messageview,
 {
        TextView *textview = messageview->textview;
        MimeView *mimeview = messageview->mimeview;
-       GtkWidget *plugview = messageview->plugview;
 
        if (messageview->type == type) return;
 
        if (type == MVIEW_MIME) {
-               if (messageview->type == MVIEW_TEXT)
-                       gtkut_container_remove
-                               (GTK_CONTAINER(GTK_WIDGET_PTR(messageview)),
-                                GTK_WIDGET_PTR(textview));
-               else if (messageview->type == MVIEW_PLUG)
-                       gtkut_container_remove
-                               (GTK_CONTAINER(GTK_WIDGET_PTR(messageview)),
-                                GTK_WIDGET_PTR(plugview));
-               gtk_box_pack_start(GTK_BOX(messageview->vbox),
-                                  GTK_WIDGET_PTR(mimeview), TRUE, TRUE, 0);
-               gtk_container_add(GTK_CONTAINER(mimeview->vbox),
-                                 GTK_WIDGET_PTR(textview));
+               gtkut_container_remove
+                       (GTK_CONTAINER(GTK_WIDGET_PTR(messageview)),
+                        GTK_WIDGET_PTR(textview));
        } else if (type == MVIEW_TEXT) {
-               if (messageview->type == MVIEW_MIME)
-                       gtkut_container_remove
-                               (GTK_CONTAINER(GTK_WIDGET_PTR(messageview)),
-                                GTK_WIDGET_PTR(mimeview));
-               else if (messageview->type == MVIEW_PLUG)
-                       gtkut_container_remove
-                               (GTK_CONTAINER(GTK_WIDGET_PTR(messageview)),
-                                GTK_WIDGET_PTR(plugview));
+               gtkut_container_remove
+                       (GTK_CONTAINER(GTK_WIDGET_PTR(messageview)),
+                        GTK_WIDGET_PTR(mimeview));
+
                if (mimeview->vbox == GTK_WIDGET_PTR(textview)->parent)
                        gtkut_container_remove(GTK_CONTAINER(mimeview->vbox),
                                               GTK_WIDGET_PTR(textview));
 
                gtk_box_pack_start(GTK_BOX(messageview->vbox),
                                   GTK_WIDGET_PTR(textview), TRUE, TRUE, 0);
-       } else if (type == MVIEW_PLUG) {
-               if (messageview->type == MVIEW_MIME)
-                       gtkut_container_remove
-                               (GTK_CONTAINER(GTK_WIDGET_PTR(messageview)),
-                                GTK_WIDGET_PTR(mimeview));
-               else if (messageview->type == MVIEW_TEXT)
-                       gtkut_container_remove
-                               (GTK_CONTAINER(GTK_WIDGET_PTR(messageview)),
-                                GTK_WIDGET_PTR(textview));
-               gtk_box_pack_start(GTK_BOX(messageview->vbox),
-                                  GTK_WIDGET_PTR(plugview), TRUE, TRUE, 0);
        } else
                return;
 
@@ -509,7 +483,6 @@ void messageview_destroy(MessageView *messageview)
        textview_destroy(messageview->textview);
        imageview_destroy(messageview->imageview);
        mimeview_destroy(messageview->mimeview);
-       gtk_widget_destroy(messageview->plugview);
 
        g_free(messageview);
 
index 609cdb661145b76aab657a57b5c0aabf00787965..9b89bc9be887b1d54e35fc4ac509646b8f235b78 100644 (file)
@@ -35,8 +35,7 @@ typedef struct _MessageView   MessageView;
 typedef enum
 {
        MVIEW_TEXT,
-       MVIEW_MIME,
-       MVIEW_PLUG
+       MVIEW_MIME
 } MessageType;
 
 struct _MessageView
@@ -51,7 +50,6 @@ struct _MessageView
        TextView *textview;
        ImageView *imageview;
        MimeView *mimeview;
-       GtkWidget *plugview;
 
        MainWindow *mainwin;