From b442126db14d576e2fd3126bb28237c22e5dedb0 Mon Sep 17 00:00:00 2001
From: Christophe Fergeau <cfergeau@redhat.com>
Date: Sun, 29 Jun 2014 19:21:37 +0200
Subject: [PATCH] keyboard: Remove 'gettext_package' handling

It's part of CcKeyboardItem but nothing uses it. It's also parsed
when loading KeyListEntry XML, but never used. The key description is
translated using Keylist::package before gettext_package is assigned.

https://bugzilla.gnome.org/show_bug.cgi?id=749381
---
 panels/keyboard/cc-keyboard-item.c   | 1 -
 panels/keyboard/cc-keyboard-item.h   | 1 -
 panels/keyboard/keyboard-shortcuts.c | 3 ---
 3 files changed, 5 deletions(-)

diff --git a/panels/keyboard/cc-keyboard-item.c b/panels/keyboard/cc-keyboard-item.c
index d185a6728..90618d387 100644
--- a/panels/keyboard/cc-keyboard-item.c
+++ b/panels/keyboard/cc-keyboard-item.c
@@ -330,7 +330,6 @@ cc_keyboard_item_finalize (GObject *object)
 
   /* Free memory */
   g_free (item->priv->binding);
-  g_free (item->gettext_package);
   g_free (item->gsettings_path);
   g_free (item->description);
   g_free (item->command);
diff --git a/panels/keyboard/cc-keyboard-item.h b/panels/keyboard/cc-keyboard-item.h
index 945e235b8..19a43d8b0 100644
--- a/panels/keyboard/cc-keyboard-item.h
+++ b/panels/keyboard/cc-keyboard-item.h
@@ -63,7 +63,6 @@ typedef struct
   BindingGroupType group;
   GtkTreeModel *model;
   char *description;
-  char *gettext_package;
   gboolean editable;
 
   /* GSettings path */
diff --git a/panels/keyboard/keyboard-shortcuts.c b/panels/keyboard/keyboard-shortcuts.c
index d3ad46e36..e783d64ac 100644
--- a/panels/keyboard/keyboard-shortcuts.c
+++ b/panels/keyboard/keyboard-shortcuts.c
@@ -58,7 +58,6 @@ typedef struct
   CcKeyboardItemType type;
   char *schema; /* GSettings schema name, if any */
   char *description; /* description for GSettings types */
-  char *gettext_package;
   char *name; /* GSettings schema path, or GSettings key name depending on type */
   char *reverse_entry;
   gboolean is_reversed;
@@ -480,7 +479,6 @@ parse_start_tag (GMarkupParseContext *ctx,
   key.name = g_strdup (name);
   key.type = CC_KEYBOARD_ITEM_TYPE_GSETTINGS;
   key.description = replace_pictures_folder (description);
-  key.gettext_package = g_strdup (keylist->package);
   key.schema = schema ? g_strdup (schema) : g_strdup (keylist->schema);
   key.reverse_entry = g_strdup (reverse_entry);
   key.is_reversed = is_reversed;
@@ -590,7 +588,6 @@ append_sections_from_file (GtkBuilder *builder, const gchar *path, const char *d
     KeyListEntry *entry = &keys[i];
     g_free (entry->schema);
     g_free (entry->description);
-    g_free (entry->gettext_package);
     g_free (entry->name);
     g_free (entry->reverse_entry);
   }