Very small patches for review
- From: Peter Harvey <peter a harvey gmail com>
- To: Christian Persch <chpe gnome org>
- Cc: Epiphany List <epiphany-list gnome org>
- Subject: Very small patches for review
- Date: Fri, 06 Jan 2006 13:54:33 +1100
egg-toolbars-model:
Removed unused struct.
ephy-bookmarks-menu:
Do not add bookmarks to a flat menu more than once.
Bookmarks may still appear at different places in the hierarchy.
ephy-node:
Skip writing out a string property if it is NULL (fixes segfault).
Index: lib/egg/egg-toolbars-model.h
===================================================================
RCS file: /cvs/gnome/epiphany/lib/egg/egg-toolbars-model.h,v
retrieving revision 1.22
diff -r1.22 egg-toolbars-model.h
105,110d104
< struct EggToolbarsItemAvailable
< {
< const char * name;
< guint available;
< };
<
Index: src/bookmarks/ephy-bookmarks-menu.c
===================================================================
RCS file: /cvs/gnome/epiphany/src/bookmarks/ephy-bookmarks-menu.c,v
retrieving revision 1.42
diff -r1.42 ephy-bookmarks-menu.c
77c77
< guint i;
---
> guint i, j;
84c84
< GPtrArray *subset, *covering, *subdivisions, *submenus;
---
> GPtrArray *subset, *covering, *subdivisions, *submenus, *unused;
99a100
> unused = g_ptr_array_sized_new (bookmarks->len);
146a148,153
>
> /* Build a list of bookmarks which don't appear in any subdivision yet. */
> for (i = 0; i < bookmarks->len; i++)
> {
> g_ptr_array_add (unused, g_ptr_array_index (bookmarks, i));
> }
152c159
< ephy_nodes_get_covered (topic, bookmarks, subset);
---
> ephy_nodes_get_covered (topic, unused, subset);
157a165,170
>
> /* Record that each bookmark has been added. */
> for (j = 0; j < subset->len; j++)
> {
> g_ptr_array_remove_fast (unused, g_ptr_array_index (subset, j));
> }
164a178
> g_ptr_array_free (unused, TRUE);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]