[frogr] Renamed FSP_LICENSE_UNKNOWN to FSP_LICENSE_NONE
- From: Mario Sanchez Prada <msanchez src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [frogr] Renamed FSP_LICENSE_UNKNOWN to FSP_LICENSE_NONE
- Date: Sat, 9 Jul 2011 01:17:39 +0000 (UTC)
commit 8310127850912a8977d10c8551c41a8e49d4e7b2
Author: Mario Sanchez Prada <msanchez igalia com>
Date: Sat Jul 9 01:26:37 2011 +0200
Renamed FSP_LICENSE_UNKNOWN to FSP_LICENSE_NONE
src/flicksoup/fsp-data.c | 2 +-
src/flicksoup/fsp-data.h | 2 +-
src/frogr-controller.c | 6 +++---
src/frogr-picture.c | 8 ++++----
4 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/src/flicksoup/fsp-data.c b/src/flicksoup/fsp-data.c
index 38ecead..d6742d5 100644
--- a/src/flicksoup/fsp-data.c
+++ b/src/flicksoup/fsp-data.c
@@ -66,7 +66,7 @@ fsp_data_new (FspDataType type)
new_data->photo_info.secret = NULL;
new_data->photo_info.server = NULL;
new_data->photo_info.is_favorite = FALSE;
- new_data->photo_info.license = FSP_LICENSE_UNKNOWN;
+ new_data->photo_info.license = FSP_LICENSE_NONE;
new_data->photo_info.rotation = FSP_ROTATION_NONE;
new_data->photo_info.orig_secret = NULL;
new_data->photo_info.orig_format = NULL;
diff --git a/src/flicksoup/fsp-data.h b/src/flicksoup/fsp-data.h
index 548c3ca..5e5dae6 100644
--- a/src/flicksoup/fsp-data.h
+++ b/src/flicksoup/fsp-data.h
@@ -84,7 +84,7 @@ typedef enum {
} FspPermission;
typedef enum {
- FSP_LICENSE_UNKNOWN = -1,
+ FSP_LICENSE_NONE = -1,
FSP_LICENSE_ALL_RIGHTS = 0,
FSP_LICENSE_AT_NC_SA = 1,
FSP_LICENSE_AT_NC = 2,
diff --git a/src/frogr-controller.c b/src/frogr-controller.c
index 860f8bd..27b424c 100644
--- a/src/frogr-controller.c
+++ b/src/frogr-controller.c
@@ -566,14 +566,14 @@ _upload_picture_cb (GObject *object, GAsyncResult *res, gpointer data)
{
GSList *sets = NULL;
GSList *groups = NULL;
- FspLicense license = FSP_LICENSE_UNKNOWN;
+ FspLicense license = FSP_LICENSE_NONE;
license = frogr_picture_get_license (picture);
sets = frogr_picture_get_sets (picture);
groups = frogr_picture_get_groups (picture);
/* Set license if needed */
- if (license != FSP_LICENSE_UNKNOWN)
+ if (license != FSP_LICENSE_NONE)
{
priv->setting_license = TRUE;
@@ -968,7 +968,7 @@ _notify_setting_license (FrogrController *self,
{
FrogrControllerPrivate *priv = NULL;
const gchar *picture_title = NULL;
- FspLicense license = FSP_LICENSE_UNKNOWN;
+ FspLicense license = FSP_LICENSE_NONE;
gchar *progress_text = NULL;
priv = FROGR_CONTROLLER_GET_PRIVATE (self);
diff --git a/src/frogr-picture.c b/src/frogr-picture.c
index 0c26b49..022e3f6 100644
--- a/src/frogr-picture.c
+++ b/src/frogr-picture.c
@@ -452,9 +452,9 @@ frogr_picture_class_init(FrogrPictureClass *klass)
g_param_spec_int ("license",
"license",
"License for this picture",
- FSP_LICENSE_UNKNOWN,
+ FSP_LICENSE_NONE,
FSP_LICENSE_ND,
- FSP_LICENSE_UNKNOWN,
+ FSP_LICENSE_NONE,
G_PARAM_READWRITE));
g_object_class_install_property (obj_class,
PROP_SHOW_IN_SEARCH,
@@ -518,7 +518,7 @@ frogr_picture_init (FrogrPicture *self)
priv->safety_level = FSP_SAFETY_LEVEL_SAFE;
priv->content_type = FSP_CONTENT_TYPE_PHOTO;
- priv->license = FSP_LICENSE_UNKNOWN;
+ priv->license = FSP_LICENSE_NONE;
priv->show_in_search = TRUE;
@@ -546,7 +546,7 @@ frogr_picture_new (const gchar *fileuri,
"is-friend", friend,
"safety-level", FSP_SAFETY_LEVEL_SAFE,
"content-type", FSP_CONTENT_TYPE_PHOTO,
- "license", FSP_LICENSE_UNKNOWN,
+ "license", FSP_LICENSE_NONE,
"show_in_search", TRUE,
NULL));
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]