aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--e-util/ChangeLog4
-rw-r--r--e-util/e-popup-menu.c13
-rw-r--r--widgets/misc/e-popup-menu.c13
3 files changed, 18 insertions, 12 deletions
diff --git a/e-util/ChangeLog b/e-util/ChangeLog
index f5d1c2a4de..2794a53336 100644
--- a/e-util/ChangeLog
+++ b/e-util/ChangeLog
@@ -1,5 +1,9 @@
2000-08-09 Christopher James Lahey <clahey@helixcode.com>
+ * e-popup-menu.c: Ooops.
+
+2000-08-09 Christopher James Lahey <clahey@helixcode.com>
+
* e-util.c, e-util.h: Added uncompiled e_read_uri function.
2000-08-09 Christopher James Lahey <clahey@helixcode.com>
diff --git a/e-util/e-popup-menu.c b/e-util/e-popup-menu.c
index 619f40a22d..e7423e40f0 100644
--- a/e-util/e-popup-menu.c
+++ b/e-util/e-popup-menu.c
@@ -61,8 +61,8 @@ e_popup_menu_create (EPopupMenu *menu_list, int disable_mask, int hide_mask, voi
{
GtkMenu *menu = GTK_MENU (gtk_menu_new ());
int i;
- gboolean last_item_separator = TRUE;
- gint last_non_separator = -1;
+ gboolean last_item_seperator = TRUE;
+ gint last_non_seperator = -1;
for (i = 0; menu_list[i].name; i++) {
if (strcmp("", menu_list[i].name) && !(menu_list [i].disable_mask & hide_mask)) {
@@ -70,13 +70,13 @@ e_popup_menu_create (EPopupMenu *menu_list, int disable_mask, int hide_mask, voi
}
}
- for (i = 0; i < last_non_separator; i++) {
+ for (i = 0; i < last_non_seperator; i++) {
GtkWidget *item;
- gboolean separator;
+ gboolean seperator;
- separator = !strcmp("", menu_list[i].name);
+ seperator = !strcmp("", menu_list[i].name);
- if ((!(separator && last_separator)) && !(menu_list [i].disable_mask & hide_mask)) {
+ if ((!(seperator && last_item_seperator)) && !(menu_list [i].disable_mask & hide_mask)) {
item = make_item (menu, menu_list [i].name,
menu_list [i].pixname);
@@ -93,6 +93,7 @@ e_popup_menu_create (EPopupMenu *menu_list, int disable_mask, int hide_mask, voi
gtk_widget_show (item);
gtk_menu_append (menu, item);
}
+ last_item_seperator = seperator;
}
return menu;
diff --git a/widgets/misc/e-popup-menu.c b/widgets/misc/e-popup-menu.c
index 619f40a22d..e7423e40f0 100644
--- a/widgets/misc/e-popup-menu.c
+++ b/widgets/misc/e-popup-menu.c
@@ -61,8 +61,8 @@ e_popup_menu_create (EPopupMenu *menu_list, int disable_mask, int hide_mask, voi
{
GtkMenu *menu = GTK_MENU (gtk_menu_new ());
int i;
- gboolean last_item_separator = TRUE;
- gint last_non_separator = -1;
+ gboolean last_item_seperator = TRUE;
+ gint last_non_seperator = -1;
for (i = 0; menu_list[i].name; i++) {
if (strcmp("", menu_list[i].name) && !(menu_list [i].disable_mask & hide_mask)) {
@@ -70,13 +70,13 @@ e_popup_menu_create (EPopupMenu *menu_list, int disable_mask, int hide_mask, voi
}
}
- for (i = 0; i < last_non_separator; i++) {
+ for (i = 0; i < last_non_seperator; i++) {
GtkWidget *item;
- gboolean separator;
+ gboolean seperator;
- separator = !strcmp("", menu_list[i].name);
+ seperator = !strcmp("", menu_list[i].name);
- if ((!(separator && last_separator)) && !(menu_list [i].disable_mask & hide_mask)) {
+ if ((!(seperator && last_item_seperator)) && !(menu_list [i].disable_mask & hide_mask)) {
item = make_item (menu, menu_list [i].name,
menu_list [i].pixname);
@@ -93,6 +93,7 @@ e_popup_menu_create (EPopupMenu *menu_list, int disable_mask, int hide_mask, voi
gtk_widget_show (item);
gtk_menu_append (menu, item);
}
+ last_item_seperator = seperator;
}
return menu;