aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer/ChangeLog6
-rw-r--r--composer/e-icon-list.c2
-rw-r--r--composer/e-icon-list.h9
3 files changed, 14 insertions, 3 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog
index 89a82dff48..0367e3b593 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,9 @@
+2002-11-13 Not Zed <NotZed@Ximian.com>
+
+ * e-icon-list.c (e_icon_list_new): Use the right object_new method.
+
+ * e-icon-list.h: get rid of BEGIN/END_GNOME_DECLS stuff.
+
2002-11-11 Jeffrey Stedfast <fejj@ximian.com>
* e-msg-composer-attachment-bar.c: Remove some unused ehaders and
diff --git a/composer/e-icon-list.c b/composer/e-icon-list.c
index ee3e22628d..0712b1bb18 100644
--- a/composer/e-icon-list.c
+++ b/composer/e-icon-list.c
@@ -2097,7 +2097,7 @@ e_icon_list_new (guint icon_width, int flags)
{
Eil *eil;
- eil = EIL (g_type_new (e_icon_list_get_type (), NULL, NULL));
+ eil = EIL (g_object_new (e_icon_list_get_type (), NULL));
e_icon_list_construct (eil, icon_width, flags);
diff --git a/composer/e-icon-list.h b/composer/e-icon-list.h
index 2fcba5c38d..73eae95b4a 100644
--- a/composer/e-icon-list.h
+++ b/composer/e-icon-list.h
@@ -37,7 +37,10 @@
#include <libgnomecanvas/gnome-canvas.h>
-BEGIN_GNOME_DECLS
+#ifdef __cplusplus
+extern "C" {
+#pragma }
+#endif /* __cplusplus */
#define E_TYPE_ICON_LIST (e_icon_list_get_type ())
#define E_ICON_LIST(obj) (GTK_CHECK_CAST ((obj), E_TYPE_ICON_LIST, EIconList))
@@ -171,6 +174,8 @@ int e_icon_list_get_icon_at (EIconList *gil,
int e_icon_list_get_items_per_line (EIconList *gil);
-END_GNOME_DECLS
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
#endif /* _GNOME_ICON_LIST_H_ */