Commit bc961a70 authored by Andy Hertzfeld's avatar Andy Hertzfeld

fixed warning about measuring NULL string that Elliot pointed out


       fixed warning about measuring NULL string that Elliot pointed out
parent b3342238
2000-02-14 Andy Hertzfeld <andy@eazel.com>
*src/nautilus-index-tabs.c:
Fixed warning about measuring NULL string that Elliot pointed out
2000-02-14 Elliot Lee <sopwith@redhat.com>
* src/ntl-window-msgs.c: Revert.
* components/help/hyperbola-nav-index.c: More work.
......
......@@ -318,7 +318,10 @@ draw_or_hit_test_all_tabs(NautilusIndexTabs *index_tabs, gboolean draw_flag, gin
if (index_tabs->details->title_mode && !draw_flag)
{
gint edge_width = tab_left_edge->art_pixbuf->width + tab_right_edge->art_pixbuf->width;
if (index_tabs->details->title == NULL)
return -1;
name_width = gdk_string_width(tab_font, index_tabs->details->title) - (2 * TAB_INDENT);
index_tabs->details->total_height = total_height;
if ((test_x >= TITLE_TAB_OFFSET) && (test_x < (TITLE_TAB_OFFSET + name_width + edge_width)))
return 0;
return -1;
......
......@@ -318,7 +318,10 @@ draw_or_hit_test_all_tabs(NautilusIndexTabs *index_tabs, gboolean draw_flag, gin
if (index_tabs->details->title_mode && !draw_flag)
{
gint edge_width = tab_left_edge->art_pixbuf->width + tab_right_edge->art_pixbuf->width;
if (index_tabs->details->title == NULL)
return -1;
name_width = gdk_string_width(tab_font, index_tabs->details->title) - (2 * TAB_INDENT);
index_tabs->details->total_height = total_height;
if ((test_x >= TITLE_TAB_OFFSET) && (test_x < (TITLE_TAB_OFFSET + name_width + edge_width)))
return 0;
return -1;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment