Merge lp:~rodrigo-moya/ubuntuone-client/upgrade-on-quota-exceeded into lp:ubuntuone-client

[Rodrigo Moya]

Some minor tweaks to upgrade functionality.

Some minor tweaks

[Natalia Bidart (nataliabidart)]

The source file has a mixture of tabs and spaces that I think should be fixed before landing.

review: Needs Fixing

[lp:~rodrigo-moya/ubuntuone-client/upgrade-on-quota-exceeded]

602. By Rodrigo Moya on 2010-07-29

Fix spacing

[Alejandro J. Cura (alecu)]

Yay fixes!

review: Approve

[Natalia Bidart (nataliabidart)]

Thanks!

review: Approve

=== modified file 'gsd-plugin/gsd-ubuntuone.c'
--- gsd-plugin/gsd-ubuntuone.c	2010-07-14 19:51:54 +0000
+++ gsd-plugin/gsd-ubuntuone.c	2010-07-29 14:43:40 +0000
@@ -38,13 +38,15 @@
 #define NO_SPACE_SHARE _("There is no available space on the folder:\n\"%s\" shared by %s")
 #define NO_SPACE_TITLE _("Out of space")
 #define UPGRADE_SUBSCRIPTION_TEXT _("Upgrade Subscription")
-#define UPGRADE_SUBSCRIPTION_URI _("http://one.ubuntu.com/plans/")
+#define UPGRADE_SUBSCRIPTION_URI "http://one.ubuntu.com/plans/"
 
-static void dialog_closed_callback (GtkDialog *dialog,
-				    gint response_id,
-				    gpointer user_data)
+static void
+dialog_closed_callback (GtkDialog *dialog,
+                        gint response_id,
+                        gpointer user_data)
 {
 	GsdUbuntuOne *plugin = GSD_UBUNTUONE (user_data);
+
 	g_debug ("dialog closed %d", response_id);
 	gtk_widget_destroy (GTK_WIDGET (plugin->out_of_space_dialog));
 	plugin->out_of_space_dialog = NULL;
@@ -57,8 +59,6 @@
 			  gboolean show_upgrade_link)
 {
 	GError *error = NULL;
-	GtkWidget *upgrade_link;
-	GtkResponseType result;
 
 	if (plugin->out_of_space_dialog != NULL) {
 		gtk_widget_destroy (GTK_WIDGET (plugin->out_of_space_dialog));
@@ -79,20 +79,18 @@
 	gtk_window_set_icon_name (GTK_WINDOW (plugin->out_of_space_dialog), "ubuntuone");
 	gtk_window_set_position (GTK_WINDOW (plugin->out_of_space_dialog), GTK_WIN_POS_CENTER);
 
-
-	upgrade_link = gtk_link_button_new_with_label (UPGRADE_SUBSCRIPTION_URI,
-						       UPGRADE_SUBSCRIPTION_TEXT);
-
-	gtk_dialog_add_action_widget (GTK_DIALOG (plugin->out_of_space_dialog),
-				      upgrade_link, 0);
-
-				      
-	if (show_upgrade_link) {
-		gtk_widget_show (GTK_WIDGET (upgrade_link));
-	}
+        if (show_upgrade_link) {
+                GtkWidget *upgrade_link;
+
+                upgrade_link = gtk_link_button_new_with_label (UPGRADE_SUBSCRIPTION_URI,
+                                                               UPGRADE_SUBSCRIPTION_TEXT);
+                gtk_widget_show (GTK_WIDGET (upgrade_link));
+                gtk_dialog_add_action_widget (GTK_DIALOG (plugin->out_of_space_dialog),
+                                              upgrade_link, 0);
+        }
 
 	g_signal_connect (G_OBJECT (plugin->out_of_space_dialog), "response",
-		      G_CALLBACK (dialog_closed_callback), plugin);
+                          G_CALLBACK (dialog_closed_callback), plugin);
 	gtk_widget_show (plugin->out_of_space_dialog);
 }
 
@@ -104,9 +102,11 @@
 {
 	gchar * volume_type;
 	GsdUbuntuOne *plugin = GSD_UBUNTUONE (user_data);
+
 	volume_type = g_hash_table_lookup (file_info, "type");
-	if (volume_type != NULL && strcmp (volume_type, "Share") == 0) {
+	if (g_strcmp0 (volume_type, "Share") == 0) {
 		gchar * other_visible_name, * path, * message;
+
 		other_visible_name = g_hash_table_lookup (file_info, "other_visible_name");
 		path = g_hash_table_lookup (file_info, "path");
 		message = g_strdup_printf (NO_SPACE_SHARE, path, other_visible_name);
@@ -121,6 +121,7 @@
 delayed_syncdaemon_start (gpointer data)
 {
 	GsdUbuntuOne *plugin;
+
 	plugin = GSD_UBUNTUONE (data);
 	g_debug ("Performing delayed syncdaemon init");
 
@@ -140,6 +141,7 @@
 gsd_ubuntuone_activate (GnomeSettingsPlugin *gsp_object)
 {
 	GsdUbuntuOne *plugin = GSD_UBUNTUONE (gsp_object);
+
 	g_timeout_add (DELAYED_START_TIMEOUT, delayed_syncdaemon_start, plugin);
 }