gnome/nautilus
gnome/nautilus
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/nautilus synced 2024-11-05 16:04:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

Check for a NULL tab_view. (tab_item_destroy): Remove the weak pointer we

Browse source 
* src/nautilus-sidebar-tabs.h:
	* src/nautilus-sidebar-tabs.c: (get_property_bag): Check for a
	NULL tab_view.
	(tab_item_destroy): Remove the weak pointer we now use for the
	tab_view lifetime.
	(nautilus_sidebar_tabs_connect_view): Add g_return_if_fail.
	(nautilus_sidebar_tabs_add_view): Add a weak pointer so we don't
	have trouble outside the tab_view lifetime.
	(nautilus_sidebar_tabs_set_title_mode): Check incoming boolean.
	(nautilus_sidebar_tabs_set_visible): Check incoming boolean.
This commit is contained in:
Darin Adler 2002-03-04 19:26:21 +00:00
parent f69f1c4359
commit 85826cc855
3 changed files with 36 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
ChangeLog
View file

@ -1,3 +1,16 @@
2002-03-04 Darin Adler <darin@bentspoon.com>
* src/nautilus-sidebar-tabs.h:
* src/nautilus-sidebar-tabs.c: (get_property_bag): Check for a
NULL tab_view.
(tab_item_destroy): Remove the weak pointer we now use for the
tab_view lifetime.
(nautilus_sidebar_tabs_connect_view): Add g_return_if_fail.
(nautilus_sidebar_tabs_add_view): Add a weak pointer so we don't
have trouble outside the tab_view lifetime.
(nautilus_sidebar_tabs_set_title_mode): Check incoming boolean.
(nautilus_sidebar_tabs_set_visible): Check incoming boolean.
2002-03-04 Darin Adler <darin@bentspoon.com> 2002-03-04 Darin Adler <darin@bentspoon.com>
* libnautilus-private/nautilus-global-preferences.c: * libnautilus-private/nautilus-global-preferences.c:

34
src/nautilus-sidebar-tabs.c
View file

@ -323,6 +323,9 @@ get_property_bag (TabItem *item)
CORBA_Environment ev; CORBA_Environment ev;
Bonobo_PropertyBag property_bag; Bonobo_PropertyBag property_bag;
if (item->tab_view == NULL) {
return CORBA_OBJECT_NIL;
}
control = nautilus_view_frame_get_control (NAUTILUS_VIEW_FRAME (item->tab_view)); control = nautilus_view_frame_get_control (NAUTILUS_VIEW_FRAME (item->tab_view));
if (control == NULL) { if (control == NULL) {
return CORBA_OBJECT_NIL; return CORBA_OBJECT_NIL;
@ -365,6 +368,8 @@ tab_item_destroy (TabItem *item)
CORBA_exception_free (&ev); CORBA_exception_free (&ev);
} }
eel_remove_weak_pointer (&item->tab_view);
g_free (item); g_free (item);
} }
@ -1406,7 +1411,7 @@ nautilus_sidebar_tabs_update_indicator (NautilusSidebarTabs *sidebar_tabs, GtkWi
for (node = sidebar_tabs->details->tab_items; node != NULL; node = node->next) { for (node = sidebar_tabs->details->tab_items; node != NULL; node = node->next) {
tab_item = node->data; tab_item = node->data;
if (tab_item->tab_view == view) { if (tab_item->tab_view == view) {
nautilus_sidebar_tabs_update_tab_item (sidebar_tabs, tab_item); nautilus_sidebar_tabs_update_tab_item (sidebar_tabs, tab_item);
break; break;
} }
} }
@ -1431,6 +1436,9 @@ nautilus_sidebar_tabs_connect_view (NautilusSidebarTabs *sidebar_tabs, GtkWidget
{ {
TabItem *tab_item; TabItem *tab_item;
Bonobo_PropertyBag property_bag; Bonobo_PropertyBag property_bag;
g_return_if_fail (NAUTILUS_IS_SIDEBAR_TABS (sidebar_tabs));
g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (view));
tab_item = get_tab_item_from_view (sidebar_tabs, view); tab_item = get_tab_item_from_view (sidebar_tabs, view);
if (tab_item == NULL) { if (tab_item == NULL) {
@ -1450,15 +1458,17 @@ nautilus_sidebar_tabs_connect_view (NautilusSidebarTabs *sidebar_tabs, GtkWidget
} }
/* add a new tab entry, return TRUE if we succeed */ /* add a new tab entry, return TRUE if we succeed */
gboolean gboolean
nautilus_sidebar_tabs_add_view (NautilusSidebarTabs *sidebar_tabs, const char *name, GtkWidget *new_view, int page_num) nautilus_sidebar_tabs_add_view (NautilusSidebarTabs *sidebar_tabs,
const char *name,
GtkWidget *new_view,
int page_num)
{ {
TabItem *new_tab_item; TabItem *new_tab_item;
g_return_val_if_fail (NAUTILUS_IS_SIDEBAR_TABS (sidebar_tabs), FALSE); g_return_val_if_fail (NAUTILUS_IS_SIDEBAR_TABS (sidebar_tabs), FALSE);
g_return_val_if_fail (name != NULL, FALSE); g_return_val_if_fail (name != NULL, FALSE);
g_return_val_if_fail (new_view != NULL, FALSE); g_return_val_if_fail (NAUTILUS_IS_VIEW_FRAME (new_view), FALSE);
/* Check to see if we already have one with this name, if so, refuse to add it */ /* Check to see if we already have one with this name, if so, refuse to add it */
if (tab_item_find_by_name (sidebar_tabs, name)) { if (tab_item_find_by_name (sidebar_tabs, name)) {
@ -1472,6 +1482,7 @@ nautilus_sidebar_tabs_add_view (NautilusSidebarTabs *sidebar_tabs, const char *n
new_tab_item->visible = TRUE; new_tab_item->visible = TRUE;
new_tab_item->tab_view = new_view; new_tab_item->tab_view = new_view;
new_tab_item->notebook_page = page_num; new_tab_item->notebook_page = page_num;
eel_add_weak_pointer (&new_tab_item->tab_view);
/* add it to the list */ /* add it to the list */
sidebar_tabs->details->tab_items = g_list_append (sidebar_tabs->details->tab_items, new_tab_item); sidebar_tabs->details->tab_items = g_list_append (sidebar_tabs->details->tab_items, new_tab_item);
@ -1484,8 +1495,7 @@ nautilus_sidebar_tabs_add_view (NautilusSidebarTabs *sidebar_tabs, const char *n
} }
/* return the name of the tab with the passed in index */ /* return the name of the tab with the passed in index */
char *
char*
nautilus_sidebar_tabs_get_title_from_index (NautilusSidebarTabs *sidebar_tabs, int which_tab) nautilus_sidebar_tabs_get_title_from_index (NautilusSidebarTabs *sidebar_tabs, int which_tab)
{ {
GList *next_tab; GList *next_tab;
@ -1498,12 +1508,11 @@ nautilus_sidebar_tabs_get_title_from_index (NautilusSidebarTabs *sidebar_tabs, i
return g_strdup (item->tab_text); return g_strdup (item->tab_text);
} }
/* shouldn't ever get here... */ /* shouldn't ever get here */
return g_strdup (""); return g_strdup ("");
} }
/* remove the specified tab entry */ /* remove the specified tab entry */
void void
nautilus_sidebar_tabs_remove_view (NautilusSidebarTabs *sidebar_tabs, const char *name) nautilus_sidebar_tabs_remove_view (NautilusSidebarTabs *sidebar_tabs, const char *name)
{ {
@ -1516,7 +1525,6 @@ nautilus_sidebar_tabs_remove_view (NautilusSidebarTabs *sidebar_tabs, const char
/* Look up the item */ /* Look up the item */
tab_item = tab_item_find_by_name (sidebar_tabs, name); tab_item = tab_item_find_by_name (sidebar_tabs, name);
if (tab_item == NULL) { if (tab_item == NULL) {
g_warning ("nautilus_sidebar_tabs_remove_view: Trying to remove a non-existing item '%s'", name); g_warning ("nautilus_sidebar_tabs_remove_view: Trying to remove a non-existing item '%s'", name);
return; return;
@ -1543,7 +1551,6 @@ nautilus_sidebar_tabs_remove_view (NautilusSidebarTabs *sidebar_tabs, const char
/* prelight a tab, from its associated notebook page number, by setting the prelight flag of /* prelight a tab, from its associated notebook page number, by setting the prelight flag of
the proper tab and clearing the others */ the proper tab and clearing the others */
void void
nautilus_sidebar_tabs_prelight_tab (NautilusSidebarTabs *sidebar_tabs, int which_tab) nautilus_sidebar_tabs_prelight_tab (NautilusSidebarTabs *sidebar_tabs, int which_tab)
{ {
@ -1576,7 +1583,6 @@ nautilus_sidebar_tabs_prelight_tab (NautilusSidebarTabs *sidebar_tabs, int which
/* select a tab, from its associated notebook page number, by making it invisible /* select a tab, from its associated notebook page number, by making it invisible
and all the others visible */ and all the others visible */
void void
nautilus_sidebar_tabs_select_tab (NautilusSidebarTabs *sidebar_tabs, int which_tab) nautilus_sidebar_tabs_select_tab (NautilusSidebarTabs *sidebar_tabs, int which_tab)
{ {
@ -1596,7 +1602,7 @@ nautilus_sidebar_tabs_select_tab (NautilusSidebarTabs *sidebar_tabs, int which_t
/* utility routine that returns true if the passed-in color is lighter than average */ /* utility routine that returns true if the passed-in color is lighter than average */
static gboolean static gboolean
is_light_color(GdkColor *color) is_light_color (GdkColor *color)
{ {
int intensity = (((color->red >> 8) * 77) + ((color->green >> 8) * 150) + ((color->blue >> 8) * 28)) >> 8; int intensity = (((color->red >> 8) * 77) + ((color->green >> 8) * 150) + ((color->blue >> 8) * 28)) >> 8;
return intensity > 160; /* biased slightly toward dark so default of 0x999999 uses light text light Susan specified */ return intensity > 160; /* biased slightly toward dark so default of 0x999999 uses light text light Susan specified */
@ -1667,6 +1673,7 @@ void
nautilus_sidebar_tabs_set_title_mode (NautilusSidebarTabs *sidebar_tabs, gboolean is_title_mode) nautilus_sidebar_tabs_set_title_mode (NautilusSidebarTabs *sidebar_tabs, gboolean is_title_mode)
{ {
g_return_if_fail (NAUTILUS_IS_SIDEBAR_TABS (sidebar_tabs)); g_return_if_fail (NAUTILUS_IS_SIDEBAR_TABS (sidebar_tabs));
g_return_if_fail (is_title_mode == FALSE || is_title_mode == TRUE);
if (sidebar_tabs->details->title_mode != !!is_title_mode) { if (sidebar_tabs->details->title_mode != !!is_title_mode) {
sidebar_tabs->details->title_mode = !!is_title_mode; sidebar_tabs->details->title_mode = !!is_title_mode;
@ -1676,7 +1683,6 @@ nautilus_sidebar_tabs_set_title_mode (NautilusSidebarTabs *sidebar_tabs, gboolea
} }
/* set the visibility of the selected tab */ /* set the visibility of the selected tab */
void void
nautilus_sidebar_tabs_set_visible (NautilusSidebarTabs *sidebar_tabs, nautilus_sidebar_tabs_set_visible (NautilusSidebarTabs *sidebar_tabs,
const char *name, const char *name,
@ -1686,10 +1692,10 @@ nautilus_sidebar_tabs_set_visible (NautilusSidebarTabs *sidebar_tabs,
g_return_if_fail (NAUTILUS_IS_SIDEBAR_TABS (sidebar_tabs)); g_return_if_fail (NAUTILUS_IS_SIDEBAR_TABS (sidebar_tabs));
g_return_if_fail (name != NULL); g_return_if_fail (name != NULL);
g_return_if_fail (is_visible == FALSE || is_visible == TRUE);
/* Look up the item */ /* Look up the item */
tab_item = tab_item_find_by_name (sidebar_tabs, name); tab_item = tab_item_find_by_name (sidebar_tabs, name);
if (tab_item == NULL) { if (tab_item == NULL) {
g_warning ("nautilus_sidebar_tabs_set_visible: Trying to munge a non-existing item '%s'", name); g_warning ("nautilus_sidebar_tabs_set_visible: Trying to munge a non-existing item '%s'", name);
return; return;

7
src/nautilus-sidebar-tabs.h
View file

@ -51,15 +51,14 @@ typedef struct
GtkMiscClass base_slot; GtkMiscClass base_slot;
} NautilusSidebarTabsClass; } NautilusSidebarTabsClass;
GtkType nautilus_sidebar_tabs_get_type (void); GType nautilus_sidebar_tabs_get_type (void);
GtkWidget *nautilus_sidebar_tabs_new (void); GtkWidget *nautilus_sidebar_tabs_new (void);
gboolean nautilus_sidebar_tabs_add_view (NautilusSidebarTabs *sidebar_tabs, gboolean nautilus_sidebar_tabs_add_view (NautilusSidebarTabs *sidebar_tabs,
const char *name, const char *name,
GtkWidget *new_view, GtkWidget *new_view,
int page_number); int page_number);
void nautilus_sidebar_tabs_connect_view (NautilusSidebarTabs *sidebar_tabs, void nautilus_sidebar_tabs_connect_view (NautilusSidebarTabs *sidebar_tabs,
GtkWidget *view); GtkWidget *view);
char * nautilus_sidebar_tabs_get_title_from_index (NautilusSidebarTabs *sidebar_tabs, char * nautilus_sidebar_tabs_get_title_from_index (NautilusSidebarTabs *sidebar_tabs,
int which_tab); int which_tab);
int nautilus_sidebar_tabs_hit_test (NautilusSidebarTabs *sidebar_tabs, int nautilus_sidebar_tabs_hit_test (NautilusSidebarTabs *sidebar_tabs,