diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | addressbook/gui/component/addressbook.c | 47 | ||||
| -rw-r--r-- | mail/ChangeLog | 5 | ||||
| -rw-r--r-- | mail/folder-browser.c | 2 | ||||
| -rw-r--r-- | widgets/e-table/ChangeLog | 6 | ||||
| -rw-r--r-- | widgets/e-table/e-table-col.c | 1 | ||||
| -rw-r--r-- | widgets/table/e-table-col.c | 1 |
7 files changed, 51 insertions, 17 deletions
@@ -1,3 +1,9 @@ +2000-04-09 Matt Loper <matt@helixcode.com> + + * addressbook/gui/component/addressbook.c (addressbook_factory): + Added gtk_widget_push/pop_colormap/visual, which I assume is + necessary for canvas use. + 2000-04-08 Christopher James Lahey <clahey@helixcode.com> * addressbook/contact-editor/Makefile.am, diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c index 3fb9a036ca..28422e4194 100644 --- a/addressbook/gui/component/addressbook.c +++ b/addressbook/gui/component/addressbook.c @@ -68,7 +68,8 @@ control_activate (BonoboControl *control, BonoboUIHandler *uih) remote_uih = bonobo_control_get_remote_ui_handler (control); bonobo_ui_handler_set_container (uih, remote_uih); - bonobo_ui_handler_menu_new_item (uih, "/Actions/New Contact", N_("_New Contact"), + bonobo_ui_handler_menu_new_item (uih, "/Actions/New Contact", + N_("_New Contact"), NULL, -1, BONOBO_UI_HANDLER_PIXMAP_NONE, NULL, 0, 0, do_nothing_cb, NULL); @@ -198,24 +199,32 @@ addressbook_factory (BonoboGenericFactory *Factory, void *closure) EBook *book; GtkWidget *vbox, *scrollbar; AddressbookView *view; + + gtk_widget_push_visual (gdk_rgb_get_visual ()); + gtk_widget_push_colormap (gdk_rgb_get_cmap ()); + view = g_new (AddressbookView, 1); vbox = gtk_vbox_new(FALSE, 0); view->canvas = e_canvas_new(); - view->rect = gnome_canvas_item_new( gnome_canvas_root( GNOME_CANVAS( view->canvas ) ), - gnome_canvas_rect_get_type(), - "x1", (double) 0, - "y1", (double) 0, - "x2", (double) 100, - "y2", (double) 100, - "fill_color", "white", - NULL ); - view->view = gnome_canvas_item_new( gnome_canvas_root( GNOME_CANVAS( view->canvas ) ), - e_minicard_view_get_type(), - "height", (double) 100, - "minimum_width", (double) 100, - NULL ); + view->rect = gnome_canvas_item_new( + gnome_canvas_root( GNOME_CANVAS( view->canvas ) ), + gnome_canvas_rect_get_type(), + "x1", (double) 0, + "y1", (double) 0, + "x2", (double) 100, + "y2", (double) 100, + "fill_color", "white", + NULL ); + + view->view = gnome_canvas_item_new( + gnome_canvas_root( GNOME_CANVAS( view->canvas ) ), + e_minicard_view_get_type(), + "height", (double) 100, + "minimum_width", (double) 100, + NULL ); + gtk_signal_connect( GTK_OBJECT( view->canvas ), "reflow", GTK_SIGNAL_FUNC( resize ), view); @@ -226,7 +235,8 @@ addressbook_factory (BonoboGenericFactory *Factory, void *closure) gtk_box_pack_start(GTK_BOX(vbox), view->canvas, TRUE, TRUE, 0); - scrollbar = gtk_hscrollbar_new(gtk_layout_get_hadjustment(GTK_LAYOUT(view->canvas))); + scrollbar = gtk_hscrollbar_new( + gtk_layout_get_hadjustment(GTK_LAYOUT(view->canvas))); gtk_box_pack_start(GTK_BOX(vbox), scrollbar, FALSE, FALSE, 0); @@ -241,10 +251,10 @@ addressbook_factory (BonoboGenericFactory *Factory, void *closure) gtk_widget_show_all( vbox ); #if 0 - gdk_window_set_back_pixmap( GTK_LAYOUT(view->canvas)->bin_window, NULL, FALSE); + gdk_window_set_back_pixmap( + GTK_LAYOUT(view->canvas)->bin_window, NULL, FALSE); #endif - book = ebook_create(view); /* Create the control. */ @@ -253,6 +263,9 @@ addressbook_factory (BonoboGenericFactory *Factory, void *closure) gtk_signal_connect (GTK_OBJECT (control), "activate", control_activate_cb, NULL); + gtk_widget_pop_visual (); + gtk_widget_pop_colormap (); + return BONOBO_OBJECT (control); } diff --git a/mail/ChangeLog b/mail/ChangeLog index c63fb5aa0a..1a4ad5cd1b 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,8 @@ +2000-04-09 Matt Loper <matt@helixcode.com> + + * folder-browser.c (folder_browser_new): set folder_browser->uri + to NULL, so that we know when to free it. + 2000-04-07 Miguel de Icaza <miguel@gnu.org> * message-list.c (states_pixmaps): Add more beautiful art from diff --git a/mail/folder-browser.c b/mail/folder-browser.c index f4f32ba4b7..1e9603040b 100644 --- a/mail/folder-browser.c +++ b/mail/folder-browser.c @@ -252,6 +252,8 @@ folder_browser_new (void) FolderBrowser *folder_browser = gtk_type_new (folder_browser_get_type ()); my_folder_browser_init (GTK_OBJECT (folder_browser)); + folder_browser->uri = NULL; + return GTK_WIDGET (folder_browser); } diff --git a/widgets/e-table/ChangeLog b/widgets/e-table/ChangeLog index 3ed28532a8..065671f853 100644 --- a/widgets/e-table/ChangeLog +++ b/widgets/e-table/ChangeLog @@ -1,3 +1,9 @@ +2000-04-09 Matt Loper <matt@helixcode.com> + + * e-table-col.c (e_table_col_new_with_pixbuf): ref etc->ecell, + like in e_table_col_new, since that same ECell is unref'd in + etc_destroy(). + 2000-04-08 Christopher James Lahey <clahey@helixcode.com> * e-table.c: Separated some functions into an xml bit and a diff --git a/widgets/e-table/e-table-col.c b/widgets/e-table/e-table-col.c index 4e94a33279..19f6bb1747 100644 --- a/widgets/e-table/e-table-col.c +++ b/widgets/e-table/e-table-col.c @@ -102,6 +102,7 @@ e_table_col_new_with_pixbuf (int col_idx, GdkPixbuf *pixbuf, int width, int min_ etc->selected = 0; etc->resizeable = resizable; + gtk_object_ref (etc->ecell); gdk_pixbuf_ref (etc->pixbuf); return etc; diff --git a/widgets/table/e-table-col.c b/widgets/table/e-table-col.c index 4e94a33279..19f6bb1747 100644 --- a/widgets/table/e-table-col.c +++ b/widgets/table/e-table-col.c @@ -102,6 +102,7 @@ e_table_col_new_with_pixbuf (int col_idx, GdkPixbuf *pixbuf, int width, int min_ etc->selected = 0; etc->resizeable = resizable; + gtk_object_ref (etc->ecell); gdk_pixbuf_ref (etc->pixbuf); return etc; |