[almanah] core: Remove some unnecessary debug messages
- From: Philip Withnall <pwithnall src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [almanah] core: Remove some unnecessary debug messages
- Date: Thu, 14 Apr 2011 18:39:15 +0000 (UTC)
commit 9dc2c1fd153ebada2392bc774875ba6a43df217d
Author: Philip Withnall <philip tecnocode co uk>
Date: Thu Apr 14 19:05:50 2011 +0100
core: Remove some unnecessary debug messages
src/import-export-dialog.c | 8 +++-----
src/import-operation.c | 13 ++++++-------
2 files changed, 9 insertions(+), 12 deletions(-)
---
diff --git a/src/import-export-dialog.c b/src/import-export-dialog.c
index c317741..3b8aeda 100644
--- a/src/import-export-dialog.c
+++ b/src/import-export-dialog.c
@@ -75,8 +75,6 @@ almanah_import_export_dialog_init (AlmanahImportExportDialog *self)
static void
almanah_import_export_dialog_dispose (GObject *object)
{
- g_message ("almanah_import_export_dialog_dispose");
-
/* Chain up to the parent class */
G_OBJECT_CLASS (almanah_import_export_dialog_parent_class)->dispose (object);
}
@@ -165,7 +163,7 @@ static void
import_progress_cb (const GDate *date, AlmanahImportStatus status, const gchar *message, AlmanahImportResultsDialog *results_dialog)
{
AlmanahImportExportDialog *self;
-g_message ("import_progress_cb");
+
self = ALMANAH_IMPORT_EXPORT_DIALOG (gtk_window_get_transient_for (GTK_WINDOW (results_dialog))); /* set in response_cb() */
almanah_import_results_dialog_add_result (results_dialog, date, status, message);
gtk_progress_bar_pulse (self->priv->progress_bar);
@@ -176,7 +174,7 @@ import_cb (AlmanahImportOperation *operation, GAsyncResult *async_result, Almana
{
AlmanahImportExportDialog *self;
GError *error = NULL;
-g_message ("import_cb");
+
self = ALMANAH_IMPORT_EXPORT_DIALOG (gtk_window_get_transient_for (GTK_WINDOW (results_dialog))); /* set in response_cb() */
/* Check for errors (e.g. errors opening databases or files; not errors importing individual entries once we have the content to import) */
@@ -252,7 +250,7 @@ response_cb (GtkDialog *dialog, gint response_id, AlmanahImportExportDialog *sel
{
AlmanahImportExportDialogPrivate *priv = self->priv;
GFile *file;
-g_message ("response_cb");
+
/* If the user pressed Cancel, cancel the operation if we've started, and return otherwise */
if (response_id != GTK_RESPONSE_OK) {
if (priv->cancellable == NULL)
diff --git a/src/import-operation.c b/src/import-operation.c
index 44a04d6..e8f8be1 100644
--- a/src/import-operation.c
+++ b/src/import-operation.c
@@ -117,7 +117,7 @@ progress_idle_callback_cb (ProgressData *data)
{
g_assert (data->callback != NULL);
data->callback (data->date, data->status, data->message, data->user_data);
-g_message ("progress_idle_callback_cb");
+
/* Free the data */
g_free (data->message);
g_date_free (data->date);
@@ -139,7 +139,6 @@ progress_idle_callback (AlmanahImportProgressCallback callback, gpointer user_da
data->date = g_date_new_dmy (g_date_get_day (date), g_date_get_month (date), g_date_get_year (date));
data->status = status;
data->message = g_strdup (message);
-g_message ("progress_idle_callback");
/* We can't just use g_idle_add() here, since GSimpleAsyncResult uses default priority, so the finished callback will skip any outstanding
* progress callbacks in the main loop's priority queue, causing Bad Things to happen. We need to guarantee that no more progress callbacks
@@ -180,7 +179,7 @@ set_entry (AlmanahImportOperation *self, AlmanahEntry *imported_entry, const gch
GtkTextIter existing_start, existing_end, imported_start, imported_end;
gchar *header_string;
GError *error = NULL;
-g_message ("set_entry");
+
/* Check to see if there's a conflict first */
almanah_entry_get_date (imported_entry, &entry_date);
existing_entry = almanah_storage_manager_get_entry (almanah->storage_manager, &entry_date);
@@ -287,7 +286,7 @@ import_text_files (AlmanahImportOperation *self, GFile *source, AlmanahImportPro
GFileEnumerator *enumerator;
GtkTextBuffer *buffer;
GError *child_error = NULL;
-g_message ("import_text_files");
+
enumerator = g_file_enumerate_children (source, "standard::name,standard::display-name,standard::is-hidden,time::modified",
G_FILE_QUERY_INFO_NONE, NULL, error);
if (enumerator == NULL)
@@ -467,7 +466,7 @@ import_thread (GSimpleAsyncResult *result, AlmanahImportOperation *operation, GC
{
GError *error = NULL;
ImportData *data = g_simple_async_result_get_op_res_gpointer (result);
-g_message ("import_thread");
+
/* Check to see if the operation's been cancelled already */
if (g_cancellable_set_error_if_cancelled (cancellable, &error) == TRUE) {
g_simple_async_result_set_from_error (result, error);
@@ -489,7 +488,7 @@ almanah_import_operation_run (AlmanahImportOperation *self, GCancellable *cancel
{
GSimpleAsyncResult *result;
ImportData *data;
-g_message ("almanah_import_operation_run");
+
g_return_if_fail (ALMANAH_IS_IMPORT_OPERATION (self));
g_return_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable));
@@ -507,7 +506,7 @@ gboolean
almanah_import_operation_finish (AlmanahImportOperation *self, GAsyncResult *async_result, GError **error)
{
GSimpleAsyncResult *result = G_SIMPLE_ASYNC_RESULT (async_result);
-g_message ("almanah_import_operation_finish");
+
g_return_val_if_fail (ALMANAH_IS_IMPORT_OPERATION (self), FALSE);
g_return_val_if_fail (G_IS_ASYNC_RESULT (async_result), FALSE);
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]