From: Kaj-Michael Lang <milang@tal.org>
Date: Wed, 31 Oct 2007 08:35:10 +0000 (+0200)
Subject: Misc
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6ed997a3d4cb4556414b243cd51d8463c59cd839;p=mapper

Misc
---

diff --git a/src/settings-gui.c b/src/settings-gui.c
index 541a977..437ffd3 100644
--- a/src/settings-gui.c
+++ b/src/settings-gui.c
@@ -44,7 +44,6 @@ void
 update_gcs(void)
 {
 	gint i;
-	printf("%s()\n", __PRETTY_FUNCTION__);
 
 	for (i = 0; i < COLORABLE_ENUM_COUNT; i++) {
 		gdk_color_alloc(gtk_widget_get_colormap(_map_widget),
@@ -58,7 +57,6 @@ update_gcs(void)
 					   GDK_CAP_ROUND, GDK_JOIN_ROUND);
 	}
 
-	vprintf("%s(): return\n", __PRETTY_FUNCTION__);
 }
 
 static gboolean
@@ -66,7 +64,6 @@ settings_dialog_browse_forfile(GtkWidget * widget, BrowseInfo * browse_info)
 {
 	GtkWidget *dialog;
 	gint res;
-	printf("%s()\n", __PRETTY_FUNCTION__);
 
 	dialog = GTK_WIDGET(hildon_file_chooser_dialog_new(GTK_WINDOW(browse_info->dialog),
 			GTK_FILE_CHOOSER_ACTION_OPEN));
@@ -84,7 +81,6 @@ settings_dialog_browse_forfile(GtkWidget * widget, BrowseInfo * browse_info)
 
 	gtk_widget_destroy(dialog);
 
-	vprintf("%s(): return TRUE\n", __PRETTY_FUNCTION__);
 	return TRUE;
 }
 
@@ -96,22 +92,18 @@ struct _KeysDialogInfo {
 static gboolean
 settings_dialog_hardkeys_reset(GtkWidget * widget, KeysDialogInfo * cdi)
 {
-	GtkWidget *confirm;
-	printf("%s()\n", __PRETTY_FUNCTION__);
+GtkWidget *confirm;
 
-	confirm = hildon_note_new_confirmation(GTK_WINDOW(_window),
-					       _("Reset all hardware keys to their original defaults?"));
+confirm = hildon_note_new_confirmation(GTK_WINDOW(_window),
+				       _("Reset all hardware keys to their original defaults?"));
 
-	if (GTK_RESPONSE_OK == gtk_dialog_run(GTK_DIALOG(confirm))) {
-		gint i;
-		for (i = 0; i < CUSTOM_KEY_ENUM_COUNT; i++)
-			gtk_combo_box_set_active(GTK_COMBO_BOX(cdi->cmb[i]),
-						 CUSTOM_KEY_DEFAULT[i]);
-	}
-	gtk_widget_destroy(confirm);
-
-	vprintf("%s(): return\n", __PRETTY_FUNCTION__);
-	return TRUE;
+if (GTK_RESPONSE_OK == gtk_dialog_run(GTK_DIALOG(confirm))) {
+	gint i;
+	for (i = 0; i < CUSTOM_KEY_ENUM_COUNT; i++)
+		gtk_combo_box_set_active(GTK_COMBO_BOX(cdi->cmb[i]), CUSTOM_KEY_DEFAULT[i]);
+}
+gtk_widget_destroy(confirm);
+return TRUE;
 }
 
 static gboolean 
@@ -123,7 +115,6 @@ settings_dialog_hardkeys(GtkWidget * widget, GtkWidget * parent)
 	GtkWidget *label;
 	KeysDialogInfo bdi;
 	GtkWidget *btn_defaults;
-	printf("%s()\n", __PRETTY_FUNCTION__);
 
 	dialog = gtk_dialog_new_with_buttons(_("Hardware Keys"),
 					     GTK_WINDOW(parent),
@@ -199,7 +190,6 @@ settings_dialog_hardkeys(GtkWidget * widget, GtkWidget * parent)
 
 	gtk_widget_destroy(dialog);
 
-	vprintf("%s(): return\n", __PRETTY_FUNCTION__);
 	return TRUE;
 }
 
@@ -212,7 +202,6 @@ static gboolean
 settings_dialog_colors_reset(GtkWidget * widget, ColorsDialogInfo * cdi)
 {
 	GtkWidget *confirm;
-	printf("%s()\n", __PRETTY_FUNCTION__);
 
 	confirm = hildon_note_new_confirmation(GTK_WINDOW(_window),
 					       _("Reset all colors to their original defaults?"));
@@ -227,7 +216,6 @@ settings_dialog_colors_reset(GtkWidget * widget, ColorsDialogInfo * cdi)
 	}
 	gtk_widget_destroy(confirm);
 
-	vprintf("%s(): return\n", __PRETTY_FUNCTION__);
 	return TRUE;
 }
 
@@ -239,7 +227,6 @@ settings_dialog_colors(GtkWidget * widget, GtkWidget * parent)
 	GtkWidget *label;
 	GtkWidget *btn_defaults;
 	ColorsDialogInfo cdi;
-	printf("%s()\n", __PRETTY_FUNCTION__);
 
 	dialog = gtk_dialog_new_with_buttons(_("Colors"),
 					     GTK_WINDOW(parent),
@@ -354,7 +341,6 @@ settings_dialog_colors(GtkWidget * widget, GtkWidget * parent)
 
 	gtk_widget_destroy(dialog);
 
-	vprintf("%s(): return TRUE\n", __PRETTY_FUNCTION__);
 	return TRUE;
 }
 
@@ -400,7 +386,6 @@ settings_dialog(void)
 	ScanInfo scan_info = { 0 };
 	gboolean rcvr_changed = FALSE;
 	guint i;
-	printf("%s()\n", __PRETTY_FUNCTION__);
 
 	dialog = gtk_dialog_new_with_buttons(_("Settings"),
 					     GTK_WINDOW(_window),
@@ -690,6 +675,5 @@ settings_dialog(void)
 	gtk_widget_hide(dialog);
 #endif
 
-	vprintf("%s(): return %d\n", __PRETTY_FUNCTION__, rcvr_changed);
 	return rcvr_changed;
 }