[f-spot] Revert "Small fixes"
- From: Stephane Delcroix <sdelcroix src gnome org>
- To: svn-commits-list gnome org
- Subject: [f-spot] Revert "Small fixes"
- Date: Mon, 29 Jun 2009 08:31:59 +0000 (UTC)
commit 29810c3cf4abd9eb9c13380adbc65eba3de36d7b
Author: Stephane Delcroix <stephane delcroix org>
Date: Mon Jun 29 10:27:22 2009 +0200
Revert "Small fixes"
This reverts commit 5046cf191f1da13bd9ca31e2a7fe710818a17bd0, as the only valuable change in it is subject to cause NRE
.../Exporters/FacebookExport/FacebookExport.cs | 8 ++++++--
.../FacebookExport/FacebookExportDialog.cs | 11 +++++------
2 files changed, 11 insertions(+), 8 deletions(-)
---
diff --git a/extensions/Exporters/FacebookExport/FacebookExport.cs b/extensions/Exporters/FacebookExport/FacebookExport.cs
index bd931fd..7a3dde4 100644
--- a/extensions/Exporters/FacebookExport/FacebookExport.cs
+++ b/extensions/Exporters/FacebookExport/FacebookExport.cs
@@ -8,7 +8,7 @@
*
* Copyright (C) 2007 George Talusan
* Copyright (c) 2008-2009 Novell, Inc.
- * Copyright (c) 2009 Jim Ramsay
+ * Copyright (c) 2009 Jim Rasay
*
* This is free software. See COPYING for details.
*/
@@ -276,6 +276,9 @@ namespace FSpot.Exporter.Facebook
public void Run (IBrowsableCollection selection)
{
+
+ dialog = new FacebookExportDialog (selection);
+
if (selection.Items.Length > 60) {
HigMessageDialog mbox = new HigMessageDialog (dialog,
Gtk.DialogFlags.DestroyWithParent | Gtk.DialogFlags.Modal, Gtk.MessageType.Error,
@@ -286,7 +289,8 @@ namespace FSpot.Exporter.Facebook
return;
}
- dialog = new FacebookExportDialog (selection);
+
+
if (dialog.Run () != (int)ResponseType.Ok) {
dialog.Destroy ();
return;
diff --git a/extensions/Exporters/FacebookExport/FacebookExportDialog.cs b/extensions/Exporters/FacebookExport/FacebookExportDialog.cs
index ba28a78..c760959 100644
--- a/extensions/Exporters/FacebookExport/FacebookExportDialog.cs
+++ b/extensions/Exporters/FacebookExport/FacebookExportDialog.cs
@@ -8,7 +8,7 @@
*
* Copyright (C) 2007 George Talusan
* Copyright (c) 2008-2009 Novell, Inc.
- * Copyright (c) 2009 Jim Ramsay
+ * Later changes (2009) by Jim Ramsay
*
* This is free software. See COPYING for details.
*/
@@ -286,9 +286,10 @@ namespace FSpot.Exporter.Facebook
album_info_vbox.Sensitive = false;
picture_info_vbox.Sensitive = false;
+ offline_perm_check.Active = false;
+ photo_perm_check.Active = false;
permissions_hbox.Sensitive = false;
}
-
public void HandlePermissionToggled (object sender, EventArgs args)
{
string permission;
@@ -304,10 +305,10 @@ namespace FSpot.Exporter.Facebook
bool actual = account.HasPermission (permission);
if (desired != actual) {
if (desired) {
- Log.Debug("Granting {0}", permission);
+ Log.DebugFormat("Granting {0}", permission);
account.GrantPermission (permission, this);
} else {
- Log.Debug("Revoking {0}", permission);
+ Log.DebugFormat("Revoking {0}", permission);
account.RevokePermission (permission);
}
/* Double-check that things work... */
@@ -366,10 +367,8 @@ namespace FSpot.Exporter.Facebook
if (y < 0 || y > tag_image_height)
return;
- /* TODO: Actual facebook friend tagging */
//FacebookTagPopup popup = new FacebookTagPopup (friends);
}
-
void LoginProgress (double percentage, string message)
{
login_progress.Fraction = percentage;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]