Changeset 14

Show
Ignore:
Timestamp:
10/30/07 01:47:09
Author:
pvanhoof
Message:

Bugfixes

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/src/tmut-msg-view.c

    r13 r14  
    147147        priv->msg_view = view; 
    148148 
    149         /* This adds a reference to msgview (it's a gtkwidget) */ 
    150149        gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (self),  
    151                                GTK_WIDGET (view)); 
     150                        GTK_WIDGET (view)); 
    152151 
    153152        gtk_widget_show (GTK_WIDGET (priv->msg_view)); 
  • trunk/src/tmut-shell-window.c

    r13 r14  
    4343        TMutShellWindowPriv *priv = TMUT_SHELL_WINDOW_GET_PRIVATE (self); 
    4444 
    45         gtk_container_remove (GTK_CONTAINER (priv->vbox), GTK_WIDGET (priv->current)); 
     45        if (priv->current) 
     46                gtk_container_remove (GTK_CONTAINER (priv->vbox), GTK_WIDGET (priv->current)); 
    4647 
    4748        priv->childs = g_list_prepend (priv->childs, g_object_ref (child)); /* A */ 
     
    6061        TMutShellWindowPriv *priv = TMUT_SHELL_WINDOW_GET_PRIVATE (user_data); 
    6162        GList *first = NULL; 
     63        gint cnt = g_list_length (priv->childs); 
    6264 
    63         gtk_container_remove (GTK_CONTAINER (priv->vbox), GTK_WIDGET (priv->current)); 
    64         priv->childs = g_list_remove (priv->childs, priv->current); 
     65        if (cnt > 1)  
     66        { 
     67                gtk_container_remove (GTK_CONTAINER (priv->vbox), GTK_WIDGET (priv->current)); 
     68                priv->childs = g_list_remove (priv->childs, priv->current); 
    6569 
    66         g_object_unref (priv->current); /* A */ 
    67         first = g_list_first (priv->childs); 
    68         priv->current = first->data; 
    69  
    70         gtk_box_pack_start (GTK_BOX (priv->vbox), GTK_WIDGET (priv->current),  
    71                TRUE, TRUE, 0); 
     70               first = g_list_first (priv->childs); 
     71               g_object_unref (priv->current); /* A */ 
     72               priv->current = first->data; 
     73                gtk_box_pack_start (GTK_BOX (priv->vbox), GTK_WIDGET (priv->current),  
     74                       TRUE, TRUE, 0); 
     75        } 
    7276 
    7377        return;