diff options
| -rw-r--r-- | shell/ChangeLog | 8 | ||||
| -rw-r--r-- | shell/e-corba-storage.c | 7 | ||||
| -rw-r--r-- | shell/e-folder-tree.c | 12 | ||||
| -rw-r--r-- | shell/e-folder-type-registry.c | 6 | ||||
| -rw-r--r-- | shell/e-shell-view-menu.c | 2 | ||||
| -rw-r--r-- | shell/e-shell-view.c | 6 |
6 files changed, 22 insertions, 19 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index 5066c3d790..f18c26ab4f 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,11 @@ +2001-01-26 Ettore Perazzoli <ettore@ximian.com> + + * e-corba-storage.c: Remove all instances of `__FUNCTION__'. + * e-folder-tree.c: Likewise. + * e-folder-type-registry.c: Likewise. + * e-shell-view.c: Likewise. + * e-shell-view-menu.c: Likewise. + 2001-01-25 Ettore Perazzoli <ettore@ximian.com> * e-shell-view.c (e_shell_view_construct): Connect the diff --git a/shell/e-corba-storage.c b/shell/e-corba-storage.c index 9326f6ca5c..680471da14 100644 --- a/shell/e-corba-storage.c +++ b/shell/e-corba-storage.c @@ -345,11 +345,10 @@ e_corba_storage_construct (ECorbaStorage *corba_storage, CORBA_exception_init (&ev); Bonobo_Unknown_ref (storage_interface, &ev); - if (ev._major != CORBA_NO_EXCEPTION) { - g_warning ("%s -- Cannot reference Bonobo object", __FUNCTION__); - } else { + if (ev._major != CORBA_NO_EXCEPTION) + g_warning ("e_corba_storage_construct() -- Cannot reference Bonobo object"); + else priv->storage_interface = CORBA_Object_duplicate (storage_interface, &ev); - } CORBA_exception_free (&ev); diff --git a/shell/e-folder-tree.c b/shell/e-folder-tree.c index a3f5d661ee..5feb66c320 100644 --- a/shell/e-folder-tree.c +++ b/shell/e-folder-tree.c @@ -243,22 +243,22 @@ e_folder_tree_add (EFolderTree *folder_tree, parent_folder = g_hash_table_lookup (folder_tree->path_to_folder, parent_path); if (parent_folder == NULL) { - g_warning ("%s: Trying to add a subfolder to a path that does not exist yet -- %s", - __FUNCTION__, parent_path); + g_warning ("e_folder_tree_add() -- Trying to add a subfolder to a path that does not exist yet -- %s", + parent_path); return FALSE; } folder = g_hash_table_lookup (folder_tree->path_to_folder, path); if (folder != NULL) { - g_warning ("%s: Trying to add a subfolder for a path that already exists -- %s", - __FUNCTION__, path); + g_warning ("e_folder_tree_add() -- Trying to add a subfolder for a path that already exists -- %s", + path); return FALSE; } existing_path = g_hash_table_lookup (folder_tree->data_to_path, data); if (existing_path != NULL) { - g_warning ("%s: Trying to add a folder with duplicate data -- %s", - __FUNCTION__, path); + g_warning ("e_folder_tree_add() -- Trying to add a folder with duplicate data -- %s", + path); return FALSE; } diff --git a/shell/e-folder-type-registry.c b/shell/e-folder-type-registry.c index 515efe88a7..c622d0e4a5 100644 --- a/shell/e-folder-type-registry.c +++ b/shell/e-folder-type-registry.c @@ -313,7 +313,7 @@ e_folder_type_registry_get_icon_name_for_type (EFolderTypeRegistry *folder_type_ folder_type = get_folder_type (folder_type_registry, type_name); if (folder_type == NULL) { - g_warning ("%s: Unknown type -- %s", __FUNCTION__, type_name); + g_warning ("e_folder_type_registry_get_icon_name_for_type() -- Unknown type `%s'", type_name); return NULL; } @@ -333,7 +333,7 @@ e_folder_type_registry_get_icon_for_type (EFolderTypeRegistry *folder_type_regis folder_type = get_folder_type (folder_type_registry, type_name); if (folder_type == NULL) { - g_warning ("%s: Unknown type -- %s", __FUNCTION__, type_name); + g_warning ("e_folder_type_registry_get_icon_for_type() -- Unknown type `%s'", type_name); return NULL; } @@ -355,7 +355,7 @@ e_folder_type_registry_get_handler_for_type (EFolderTypeRegistry *folder_type_re folder_type = get_folder_type (folder_type_registry, type_name); if (folder_type == NULL) { - g_warning ("%s: Unknown type -- %s", __FUNCTION__, type_name); + g_warning ("e_folder_type_registry_get_handler_for_type() -- Unknown type `%s'", type_name); return NULL; } diff --git a/shell/e-shell-view-menu.c b/shell/e-shell-view-menu.c index ec2e2edfb2..42b7753197 100644 --- a/shell/e-shell-view-menu.c +++ b/shell/e-shell-view-menu.c @@ -395,7 +395,7 @@ command_xml_dump (gpointer dummy, static void \ func (BonoboUIComponent *uic, void *data, const char *path) \ { \ - g_warning ("EShellView: %s: not implemented.", __FUNCTION__); \ + g_warning ("e-shell-view-menu.c: %s: not implemented.", #func); \ } \ static void diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c index 27759f2fb1..4bdb8139d7 100644 --- a/shell/e-shell-view.c +++ b/shell/e-shell-view.c @@ -196,8 +196,6 @@ storage_set_view_box_button_release_event_cb (GtkWidget *widget, shell_view = E_SHELL_VIEW (data); - puts (__FUNCTION__); - popdown_transient_folder_bar (shell_view); } @@ -237,7 +235,7 @@ storage_set_view_box_map_cb (GtkWidget *widget, | GDK_LEAVE_NOTIFY_MASK | GDK_POINTER_MOTION_MASK), NULL, NULL, GDK_CURRENT_TIME) != 0) { - g_warning ("%s -- pointer grab failed.", __FUNCTION__); + g_warning ("e-shell-view.c:storage_set_view_box_map_cb() -- pointer grab failed."); e_shell_view_set_folder_bar_mode (shell_view, E_SHELL_VIEW_SUBWINDOW_STICKY); return; } @@ -408,8 +406,6 @@ storage_selected_cb (EStorageSetView *storage_set_view, path = g_strconcat (G_DIR_SEPARATOR_S, name, NULL); switch_on_folder_tree_click (shell_view, path); - puts (__FUNCTION__); - g_free (path); } |