Fix my new `Creating pixmap from xpm' warning
authorColin Leroy <colin@colino.net>
Thu, 22 Aug 2002 15:43:20 +0000 (15:43 +0000)
committerColin Leroy <colin@colino.net>
Thu, 22 Aug 2002 15:43:20 +0000 (15:43 +0000)
ChangeLog.claws
configure.in
src/summaryview.c

index 7fd7337..2393a3d 100644 (file)
@@ -1,3 +1,8 @@
+2002-08-22 [colin]     0.8.1claws102
+
+       * src/summaryview.c
+               Fix my new `Creating pixmap from xpm' warning
+
 2002-08-22 [colin]     0.8.1claws101
 
        * src/mainwindow.c
index e698d74..bc7877d 100644 (file)
@@ -8,7 +8,7 @@ MINOR_VERSION=8
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws101
+EXTRA_VERSION=claws102
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
index 0ed7768..ad7d08f 100644 (file)
@@ -466,7 +466,6 @@ SummaryView *summary_create(void)
        GtkWidget *search_type_opt;
        GtkWidget *search_type;
        GtkWidget *search_string;
-       GtkWidget *search_pixmap;
        GtkWidget *menuitem;
        GtkWidget *toggle_search;
        GtkTooltips *search_tip;
@@ -481,18 +480,15 @@ SummaryView *summary_create(void)
        /* create status label */
        hbox = gtk_hbox_new(FALSE, 0);
        
-       search_pixmap = stock_pixmap_widget(hbox, STOCK_PIXMAP_QUICKSEARCH);
-
        search_tip = gtk_tooltips_new();
        toggle_search = gtk_toggle_button_new();
-       gtk_container_add (GTK_CONTAINER(toggle_search), search_pixmap);
+
        gtk_tooltips_set_tip(GTK_TOOLTIPS(search_tip),
                             toggle_search,
                             _("Toggle quick-search bar"), NULL);
        
        gtk_box_pack_start(GTK_BOX(hbox), toggle_search, FALSE, FALSE, 2);      
 
-
        hbox_l = gtk_hbox_new(FALSE, 0);
        gtk_box_pack_start(GTK_BOX(hbox), hbox_l, TRUE, TRUE, 0);
  
@@ -679,6 +675,10 @@ void summary_init(SummaryView *summaryview)
        gtk_widget_show(pixmap);
        summaryview->folder_pixmap = pixmap;
 
+       pixmap = stock_pixmap_widget(summaryview->hbox, STOCK_PIXMAP_QUICKSEARCH);
+       gtk_container_add (GTK_CONTAINER(summaryview->toggle_search), pixmap);
+       gtk_widget_show(pixmap);
+       
        /* Init summaryview prefs */
        summaryview->sort_key = SORT_BY_NONE;
        summaryview->sort_type = SORT_ASCENDING;