diff options
| author | Sanshao Jiang <alex.jiang@sun.com> | 2003-03-22 01:32:04 +0800 |
|---|---|---|
| committer | Mike Kestner <mkestner@src.gnome.org> | 2003-03-22 01:32:04 +0800 |
| commit | 8794fa517a53f6f54351bc0b2b81a839fba20b03 (patch) | |
| tree | d629a94e59a6082289ee0948168de265b4ca99bb | |
| parent | 3cb47e53a6e9d3f3d43b496629751cecbd25b27a (diff) | |
| download | gsoc2013-evolution-8794fa517a53f6f54351bc0b2b81a839fba20b03.tar.gz gsoc2013-evolution-8794fa517a53f6f54351bc0b2b81a839fba20b03.tar.zst gsoc2013-evolution-8794fa517a53f6f54351bc0b2b81a839fba20b03.zip | |
Use glib macro G_GNUC_FUNCTION instead of __FUNCTION__. Thank u, Ettore.
2003-03-19 Sanshao Jiang <alex.jiang@sun.com>
* gal-view-collection.c (gal_view_collection_append_with_title):
(gal_view_collection_set_nth_view): Use glib macro G_GNUC_FUNCTION
instead of __FUNCTION__. Thank u, Ettore.
* gal-view-instance.c (gal_view_instance_set_current_view_id): same
(add_popup_radio_item): Fix to be compilable on other compilers,
using gcc extension independent codes.(bug#39176)
(add_popup_menu_item): same
svn path=/trunk/; revision=20455
| -rw-r--r-- | widgets/menus/gal-view-collection.c | 4 | ||||
| -rw-r--r-- | widgets/menus/gal-view-instance.c | 9 |
2 files changed, 7 insertions, 6 deletions
diff --git a/widgets/menus/gal-view-collection.c b/widgets/menus/gal-view-collection.c index 87ac878b83..e85d7e765b 100644 --- a/widgets/menus/gal-view-collection.c +++ b/widgets/menus/gal-view-collection.c @@ -737,7 +737,7 @@ gal_view_collection_append_with_title (GalViewCollection *collection, const char gal_view_set_title (view, title); - d(g_print("%s: %p\n", __FUNCTION__, view)); + d(g_print("%s: %p\n", G_GNUC_FUNCTION, view)); item = g_new(GalViewCollectionItem, 1); item->ever_changed = TRUE; @@ -775,7 +775,7 @@ gal_view_collection_set_nth_view (GalViewCollection *collection, int i, GalView g_return_val_if_fail (i >= 0, NULL); g_return_val_if_fail (i < collection->view_count, NULL); - d(g_print("%s: %p\n", __FUNCTION__, view)); + d(g_print("%s: %p\n", G_GNUC_FUNCTION, view)); item = collection->view_data[i]; diff --git a/widgets/menus/gal-view-instance.c b/widgets/menus/gal-view-instance.c index c26eadb5df..19a3726de2 100644 --- a/widgets/menus/gal-view-instance.c +++ b/widgets/menus/gal-view-instance.c @@ -365,7 +365,7 @@ gal_view_instance_set_current_view_id (GalViewInstance *instance, const char *vi g_return_if_fail (instance != NULL); g_return_if_fail (GAL_IS_VIEW_INSTANCE (instance)); - d(g_print("%s: view_id set to %s\n", __FUNCTION__, view_id)); + d(g_print("%s: view_id set to %s\n", G_GNUC_FUNCTION, view_id)); if (instance->current_id && !strcmp (instance->current_id, view_id)) return; @@ -483,12 +483,13 @@ add_popup_radio_item (EPopupMenu *menu_item, gpointer closure, gboolean value) { - const EPopupMenu menu_item_struct = + EPopupMenu menu_item_struct = E_POPUP_RADIO_ITEM_CC (title, fn, closure, 0, - value); + 0); + menu_item_struct.is_active = value; e_popup_menu_copy_1 (menu_item, &menu_item_struct); } @@ -499,7 +500,7 @@ add_popup_menu_item (EPopupMenu *menu_item, GCallback fn, gpointer closure) { - const EPopupMenu menu_item_struct = + EPopupMenu menu_item_struct = E_POPUP_ITEM_CC (title, fn, closure, |