aboutsummaryrefslogtreecommitdiffstats
path: root/shell/e-icon-factory.c
Commit message (Collapse)AuthorAgeFilesLines
* Remove some `#if 0'ed broken code. New members title_icon andEttore Perazzoli2002-07-121-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * e-shell-folder-title-bar.c: Remove some `#if 0'ed broken code. New members title_icon and title_button_icon in struct EShellFolderTitleBarPrivate. Remove member icon_widget. New static global variable empty_pixbuf. (init): Initialize these new members to NULL. Don't initialize icon_widget anymore since it's gone. (e_shell_folder_title_bar_construct): Create the title_button_icon and pack it into the title_button_hbox. Also, create the title_icon and pack that one as well. Retouched some of the hardcoded padding values. (size_allocate_icon): Rewritten to use the title_icon and return the allocated space like size_allocate_navigation_buttons. (e_shell_folder_title_bar_set_icon): Remove bogus const from the @icon arg. Ref the pixbuf, and update the two pixmap widgets from it. If @icon is NULL, use the empty_pixbuf. (impl_destroy): Renamed from destroy(). (realize): Removed. (unrealize): Removed. (impl_size_allocate): Renamed from size_allocate(). (class_init): Call it. (add_icon_widget): Removed. (new_empty_pixbuf): New. (new_empty_pixmap_widget): New. (size_allocate_navigation_buttons_and_title_icon): Renamed from size_allocate_navigation_buttons; set up the title_icon too. * e-shell-view.c (update_folder_title_bar): Unref the folder_icon after using it. * e-icon-factory.c (e_icon_factory_get_icon): Ref the returned pixbuf. svn path=/trunk/; revision=17419
* (load_icon): Ooops. Swapped the large/smallEttore Perazzoli2002-07-101-6/+5
| | | | | | pixbufs here. Also, plug a leak. svn path=/trunk/; revision=17399
* Remove debugging message. (impl_shortcut_drag_motion): Likewise.Ettore Perazzoli2002-07-101-1/+0
| | | | | | | | | | | | | * e-shortcuts-view.c (impl_shortcut_drag_motion): Remove debugging message. (impl_shortcut_drag_motion): Likewise. * e-local-storage.c (remove_folder_step): Remove debugging message. * e-folder-dnd-bridge.c (e_folder_dnd_bridge_data_received): Remove debugging message. svn path=/trunk/; revision=17392
* Call e_icon_factory_init().Ettore Perazzoli2002-07-101-0/+161
* main.c (main): Call e_icon_factory_init(). * e-local-storage.c (setup_folder_as_stock): New arg @icon_name; if not NULL, set up a custom icon for the folder. (setup_stock_folders): Set up custom icons for inbox and outbox. * e-storage-set-view.c (get_pixbuf_for_folder): If the folder has a custom icon, return the custom icon. * e-folder.c: New member custom_icon_name. (init): Initialize to NULL. (destroy): Free. (e_folder_get_custom_icon): New. (e_folder_set_custom_icon): New. svn path=/trunk/; revision=17391