[gnome-photos] operation-insta-common, tool-filters: Rename the Instagram filters



commit d8946071b98d7bea99a4bbdf0a79419bf0f6e049
Author: Debarshi Ray <debarshir gnome org>
Date:   Thu Jan 28 10:37:42 2016 +0100

    operation-insta-common, tool-filters: Rename the Instagram filters
    
    ... to avoid trademark issues.

 src/photos-operation-insta-common.h |    8 +++++++-
 src/photos-tool-filters.c           |   20 ++++++++++----------
 2 files changed, 17 insertions(+), 11 deletions(-)
---
diff --git a/src/photos-operation-insta-common.h b/src/photos-operation-insta-common.h
index 137c793..fe6d1d4 100644
--- a/src/photos-operation-insta-common.h
+++ b/src/photos-operation-insta-common.h
@@ -30,7 +30,13 @@ typedef enum
   PHOTOS_OPERATION_INSTA_PRESET_BRANNAN,
   PHOTOS_OPERATION_INSTA_PRESET_GOTHAM,
   PHOTOS_OPERATION_INSTA_PRESET_HEFE,
-  PHOTOS_OPERATION_INSTA_PRESET_NASHVILLE
+  PHOTOS_OPERATION_INSTA_PRESET_NASHVILLE,
+
+  PHOTOS_OPERATION_INSTA_PRESET_1947 = PHOTOS_OPERATION_INSTA_PRESET_1977,
+  PHOTOS_OPERATION_INSTA_PRESET_CALISTOGA = PHOTOS_OPERATION_INSTA_PRESET_BRANNAN,
+  PHOTOS_OPERATION_INSTA_PRESET_MOGADISHU = PHOTOS_OPERATION_INSTA_PRESET_GOTHAM,
+  PHOTOS_OPERATION_INSTA_PRESET_CAAP = PHOTOS_OPERATION_INSTA_PRESET_HEFE,
+  PHOTOS_OPERATION_INSTA_PRESET_HOMETOWN = PHOTOS_OPERATION_INSTA_PRESET_NASHVILLE
 } PhotosOperationInstaPreset;
 
 G_END_DECLS
diff --git a/src/photos-tool-filters.c b/src/photos-tool-filters.c
index b4709fb..2928882 100644
--- a/src/photos-tool-filters.c
+++ b/src/photos-tool-filters.c
@@ -170,35 +170,35 @@ photos_tool_filters_init (PhotosToolFilters *self)
   group = photos_tool_filter_button_get_group (PHOTOS_TOOL_FILTER_BUTTON (button));
   self->buttons = g_list_prepend (self->buttons, button);
 
-  button = photos_tool_filter_button_new (group, _("1977"));
+  button = photos_tool_filter_button_new (group, _("1947"));
   gtk_actionable_set_action_name (GTK_ACTIONABLE (button), "app.insta-current");
-  gtk_actionable_set_action_target (GTK_ACTIONABLE (button), "n", (gint16) 
PHOTOS_OPERATION_INSTA_PRESET_1977);
+  gtk_actionable_set_action_target (GTK_ACTIONABLE (button), "n", (gint16) 
PHOTOS_OPERATION_INSTA_PRESET_1947);
   gtk_grid_attach (GTK_GRID (self->grid), button, 1, row, 1, 1);
   self->buttons = g_list_prepend (self->buttons, button);
   row++;
 
-  button = photos_tool_filter_button_new (group, _("Brannan"));
+  button = photos_tool_filter_button_new (group, _("Calistoga"));
   gtk_actionable_set_action_name (GTK_ACTIONABLE (button), "app.insta-current");
-  gtk_actionable_set_action_target (GTK_ACTIONABLE (button), "n", (gint16) 
PHOTOS_OPERATION_INSTA_PRESET_BRANNAN);
+  gtk_actionable_set_action_target (GTK_ACTIONABLE (button), "n", (gint16) 
PHOTOS_OPERATION_INSTA_PRESET_CALISTOGA);
   gtk_grid_attach (GTK_GRID (self->grid), button, 0, row, 1, 1);
   self->buttons = g_list_prepend (self->buttons, button);
 
-  button = photos_tool_filter_button_new (group, _("Gotham"));
+  button = photos_tool_filter_button_new (group, _("Mogadishu"));
   gtk_actionable_set_action_name (GTK_ACTIONABLE (button), "app.insta-current");
-  gtk_actionable_set_action_target (GTK_ACTIONABLE (button), "n", (gint16) 
PHOTOS_OPERATION_INSTA_PRESET_GOTHAM);
+  gtk_actionable_set_action_target (GTK_ACTIONABLE (button), "n", (gint16) 
PHOTOS_OPERATION_INSTA_PRESET_MOGADISHU);
   gtk_grid_attach (GTK_GRID (self->grid), button, 1, row, 1, 1);
   self->buttons = g_list_prepend (self->buttons, button);
   row++;
 
-  button = photos_tool_filter_button_new (group, _("Hefe"));
+  button = photos_tool_filter_button_new (group, _("Caap"));
   gtk_actionable_set_action_name (GTK_ACTIONABLE (button), "app.insta-current");
-  gtk_actionable_set_action_target (GTK_ACTIONABLE (button), "n", (gint16) 
PHOTOS_OPERATION_INSTA_PRESET_HEFE);
+  gtk_actionable_set_action_target (GTK_ACTIONABLE (button), "n", (gint16) 
PHOTOS_OPERATION_INSTA_PRESET_CAAP);
   gtk_grid_attach (GTK_GRID (self->grid), button, 0, row, 1, 1);
   self->buttons = g_list_prepend (self->buttons, button);
 
-  button = photos_tool_filter_button_new (group, _("Nashville"));
+  button = photos_tool_filter_button_new (group, _("Hometown"));
   gtk_actionable_set_action_name (GTK_ACTIONABLE (button), "app.insta-current");
-  gtk_actionable_set_action_target (GTK_ACTIONABLE (button), "n", (gint16) 
PHOTOS_OPERATION_INSTA_PRESET_NASHVILLE);
+  gtk_actionable_set_action_target (GTK_ACTIONABLE (button), "n", (gint16) 
PHOTOS_OPERATION_INSTA_PRESET_HOMETOWN);
   gtk_grid_attach (GTK_GRID (self->grid), button, 1, row, 1, 1);
   self->buttons = g_list_prepend (self->buttons, button);
   row++;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]