Adding upstream version 1:43.6.upstream/1%43.6upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

8 files changed, 923 insertions, 0 deletions

diff --git a/panels/removable-media/cc-removable-media-panel.c b/panels/removable-media/cc-removable-media-panel.c
new file mode 100644
index 0000000..6ce238e
--- /dev/null
+++ b/panels/removable-media/cc-removable-media-panel.c
@@ -0,0 +1,511 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
+ *
+ * Copyright (C) 2017 Mohammed Sadiq <sadiq@sadiqpk.org>
+ * Copyright (C) 2010 Red Hat, Inc
+ * Copyright (C) 2008 William Jon McCann <jmccann@redhat.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include <config.h>
+
+#include <glib.h>
+#include <glib/gi18n.h>
+
+#include "cc-removable-media-panel.h"
+#include "cc-removable-media-resources.h"
+
+/* Autorun options */
+#define PREF_MEDIA_AUTORUN_NEVER                "autorun-never"
+#define PREF_MEDIA_AUTORUN_X_CONTENT_START_APP  "autorun-x-content-start-app"
+#define PREF_MEDIA_AUTORUN_X_CONTENT_IGNORE     "autorun-x-content-ignore"
+#define PREF_MEDIA_AUTORUN_X_CONTENT_OPEN_FOLDER "autorun-x-content-open-folder"
+
+#define CUSTOM_ITEM_ASK "cc-item-ask"
+#define CUSTOM_ITEM_DO_NOTHING "cc-item-do-nothing"
+#define CUSTOM_ITEM_OPEN_FOLDER "cc-item-open-folder"
+
+#define MEDIA_HANDLING_SCHEMA "org.gnome.desktop.media-handling"
+
+struct _CcRemovableMediaPanel
+{
+  CcPanel              parent_instance;
+
+  GtkAppChooserButton *audio_cdda_chooser;
+  GtkCheckButton      *autorun_never_checkbutton;
+  GtkAppChooserButton *dcf_chooser;
+  GtkButton           *extra_options_button;
+  GtkBox              *handlers_box;
+  GtkAppChooserButton *music_player_chooser;
+  GtkDialog           *other_type_dialog;
+  GtkLabel            *other_action_label;
+  GtkBox              *other_action_box;
+  GtkComboBox         *other_type_combo_box;
+  GtkListStore        *other_type_list_store;
+  GtkAppChooserButton *software_chooser;
+  GtkAppChooserButton *video_dvd_chooser;
+
+  GtkAppChooserButton *other_application_chooser;
+  GSettings           *settings;
+};
+
+
+G_DEFINE_TYPE (CcRemovableMediaPanel, cc_removable_media_panel, CC_TYPE_PANEL)
+
+static char **
+remove_elem_from_str_array (char       **v,
+                            const char  *s)
+{
+  GPtrArray *array;
+  guint idx;
+
+  array = g_ptr_array_new ();
+
+  for (idx = 0; v[idx] != NULL; idx++) {
+    if (g_strcmp0 (v[idx], s) == 0) {
+      continue;
+    }
+
+    g_ptr_array_add (array, v[idx]);
+  }
+
+  g_ptr_array_add (array, NULL);
+
+  g_free (v);
+
+  return (char **) g_ptr_array_free (array, FALSE);
+}
+
+static char **
+add_elem_to_str_array (char       **v,
+                       const char  *s)
+{
+  GPtrArray *array;
+  guint idx;
+
+  array = g_ptr_array_new ();
+
+  for (idx = 0; v[idx] != NULL; idx++) {
+    g_ptr_array_add (array, v[idx]);
+  }
+
+  g_ptr_array_add (array, g_strdup (s));
+  g_ptr_array_add (array, NULL);
+
+  g_free (v);
+
+  return (char **) g_ptr_array_free (array, FALSE);
+}
+
+static void
+autorun_get_preferences (CcRemovableMediaPanel *self,
+                         const char            *x_content_type,
+                         gboolean              *pref_start_app,
+                         gboolean              *pref_ignore,
+                         gboolean              *pref_open_folder)
+{
+  g_auto(GStrv) x_content_start_app = NULL;
+  g_auto(GStrv) x_content_ignore = NULL;
+  g_auto(GStrv) x_content_open_folder = NULL;
+
+  g_return_if_fail (pref_start_app != NULL);
+  g_return_if_fail (pref_ignore != NULL);
+  g_return_if_fail (pref_open_folder != NULL);
+
+  *pref_start_app = FALSE;
+  *pref_ignore = FALSE;
+  *pref_open_folder = FALSE;
+  x_content_start_app = g_settings_get_strv (self->settings,
+                                             PREF_MEDIA_AUTORUN_X_CONTENT_START_APP);
+  x_content_ignore = g_settings_get_strv (self->settings,
+                                          PREF_MEDIA_AUTORUN_X_CONTENT_IGNORE);
+  x_content_open_folder = g_settings_get_strv (self->settings,
+                                               PREF_MEDIA_AUTORUN_X_CONTENT_OPEN_FOLDER);
+  if (x_content_start_app != NULL) {
+    *pref_start_app = g_strv_contains ((const gchar * const *) x_content_start_app, x_content_type);
+  }
+  if (x_content_ignore != NULL) {
+    *pref_ignore = g_strv_contains ((const gchar * const *) x_content_ignore, x_content_type);
+  }
+  if (x_content_open_folder != NULL) {
+    *pref_open_folder = g_strv_contains ((const gchar * const *) x_content_open_folder, x_content_type);
+  }
+}
+
+static void
+autorun_set_preferences (CcRemovableMediaPanel *self,
+                         const char            *x_content_type,
+                         gboolean               pref_start_app,
+                         gboolean               pref_ignore,
+                         gboolean               pref_open_folder)
+{
+  g_auto(GStrv) x_content_start_app = NULL;
+  g_auto(GStrv) x_content_ignore = NULL;
+  g_auto(GStrv) x_content_open_folder = NULL;
+
+  g_assert (x_content_type != NULL);
+
+  x_content_start_app = g_settings_get_strv (self->settings,
+                                             PREF_MEDIA_AUTORUN_X_CONTENT_START_APP);
+  x_content_ignore = g_settings_get_strv (self->settings,
+                                          PREF_MEDIA_AUTORUN_X_CONTENT_IGNORE);
+  x_content_open_folder = g_settings_get_strv (self->settings,
+                                               PREF_MEDIA_AUTORUN_X_CONTENT_OPEN_FOLDER);
+
+  x_content_start_app = remove_elem_from_str_array (x_content_start_app, x_content_type);
+  if (pref_start_app) {
+    x_content_start_app = add_elem_to_str_array (x_content_start_app, x_content_type);
+  }
+  g_settings_set_strv (self->settings,
+                       PREF_MEDIA_AUTORUN_X_CONTENT_START_APP, (const gchar * const*) x_content_start_app);
+
+  x_content_ignore = remove_elem_from_str_array (x_content_ignore, x_content_type);
+  if (pref_ignore) {
+    x_content_ignore = add_elem_to_str_array (x_content_ignore, x_content_type);
+  }
+  g_settings_set_strv (self->settings,
+                       PREF_MEDIA_AUTORUN_X_CONTENT_IGNORE, (const gchar * const*) x_content_ignore);
+
+  x_content_open_folder = remove_elem_from_str_array (x_content_open_folder, x_content_type);
+  if (pref_open_folder) {
+    x_content_open_folder = add_elem_to_str_array (x_content_open_folder, x_content_type);
+  }
+  g_settings_set_strv (self->settings,
+                       PREF_MEDIA_AUTORUN_X_CONTENT_OPEN_FOLDER, (const gchar * const*) x_content_open_folder);
+
+}
+
+static void
+on_custom_item_activated_cb (CcRemovableMediaPanel *self,
+                             const gchar           *item,
+                             GtkAppChooser         *app_chooser)
+{
+  g_autofree gchar *content_type = NULL;
+
+  content_type = gtk_app_chooser_get_content_type (app_chooser);
+
+  if (g_strcmp0 (item, CUSTOM_ITEM_ASK) == 0) {
+    autorun_set_preferences (self, content_type,
+                             FALSE, FALSE, FALSE);
+  } else if (g_strcmp0 (item, CUSTOM_ITEM_OPEN_FOLDER) == 0) {
+    autorun_set_preferences (self, content_type,
+                             FALSE, FALSE, TRUE);
+  } else if (g_strcmp0 (item, CUSTOM_ITEM_DO_NOTHING) == 0) {
+    autorun_set_preferences (self, content_type,
+                             FALSE, TRUE, FALSE);
+  }
+}
+
+static void
+on_chooser_changed_cb (CcRemovableMediaPanel *self,
+                       GtkAppChooser         *chooser)
+{
+  g_autoptr(GAppInfo) info = NULL;
+  g_autofree gchar *content_type = NULL;
+
+  info = gtk_app_chooser_get_app_info (chooser);
+
+  if (info == NULL)
+    return;
+
+  content_type = gtk_app_chooser_get_content_type (chooser);
+  autorun_set_preferences (self, content_type,
+                           TRUE, FALSE, FALSE);
+  g_app_info_set_as_default_for_type (info, content_type, NULL);
+}
+
+static void
+prepare_chooser (CcRemovableMediaPanel *self,
+                 GtkAppChooserButton   *button,
+                 const gchar           *heading)
+{
+  gboolean pref_ask;
+  gboolean pref_start_app;
+  gboolean pref_ignore;
+  gboolean pref_open_folder;
+  g_autoptr(GAppInfo) info = NULL;
+  g_autofree gchar *content_type = NULL;
+
+  content_type = gtk_app_chooser_get_content_type (GTK_APP_CHOOSER (button));
+
+  /* fetch preferences for this content type */
+  autorun_get_preferences (self, content_type,
+                           &pref_start_app, &pref_ignore, &pref_open_folder);
+  pref_ask = !pref_start_app && !pref_ignore && !pref_open_folder;
+
+  info = gtk_app_chooser_get_app_info (GTK_APP_CHOOSER (button));
+
+  /* append the separator only if we have >= 1 apps in the chooser */
+  if (info != NULL) {
+    gtk_app_chooser_button_append_separator (button);
+  }
+
+  gtk_app_chooser_button_append_custom_item (button, CUSTOM_ITEM_ASK,
+                                             _("Ask what to do"),
+                                             NULL);
+
+  gtk_app_chooser_button_append_custom_item (button, CUSTOM_ITEM_DO_NOTHING,
+                                             _("Do nothing"),
+                                             NULL);
+
+  gtk_app_chooser_button_append_custom_item (button, CUSTOM_ITEM_OPEN_FOLDER,
+                                             _("Open folder"),
+                                             NULL);
+
+  gtk_app_chooser_button_set_show_dialog_item (button, TRUE);
+
+  if (heading)
+    gtk_app_chooser_button_set_heading (button, _(heading));
+
+  if (pref_ask) {
+    gtk_app_chooser_button_set_active_custom_item (button, CUSTOM_ITEM_ASK);
+  } else if (pref_ignore) {
+    gtk_app_chooser_button_set_active_custom_item (button, CUSTOM_ITEM_DO_NOTHING);
+  } else if (pref_open_folder) {
+    gtk_app_chooser_button_set_active_custom_item (button, CUSTOM_ITEM_OPEN_FOLDER);
+  }
+
+  g_signal_connect_object (button, "changed",
+                           G_CALLBACK (on_chooser_changed_cb), self, G_CONNECT_SWAPPED);
+  g_signal_connect_object (button, "custom-item-activated",
+                           G_CALLBACK (on_custom_item_activated_cb), self, G_CONNECT_SWAPPED);
+}
+
+static void
+on_other_type_combo_box_changed (CcRemovableMediaPanel *self)
+{
+  GtkTreeIter iter;
+  g_autofree gchar *x_content_type = NULL;
+
+  if (!gtk_combo_box_get_active_iter (self->other_type_combo_box, &iter)) {
+    return;
+  }
+
+  gtk_tree_model_get (GTK_TREE_MODEL (self->other_type_list_store), &iter,
+                      1, &x_content_type,
+                      -1);
+
+  if (self->other_application_chooser != NULL) {
+    gtk_box_remove (self->other_action_box, GTK_WIDGET (self->other_application_chooser));
+    self->other_application_chooser = NULL;
+  }
+
+  self->other_application_chooser = GTK_APP_CHOOSER_BUTTON (gtk_app_chooser_button_new (x_content_type));
+  gtk_box_append (self->other_action_box, GTK_WIDGET (self->other_application_chooser));
+  prepare_chooser (self, self->other_application_chooser, NULL);
+
+  gtk_label_set_mnemonic_widget (self->other_action_label, GTK_WIDGET (self->other_application_chooser));
+}
+
+static void
+on_extra_options_dialog_response (CcRemovableMediaPanel *self)
+{
+  gtk_widget_hide (GTK_WIDGET (self->other_type_dialog));
+
+  if (self->other_application_chooser != NULL) {
+    gtk_box_remove (self->other_action_box, GTK_WIDGET (self->other_application_chooser));
+    self->other_application_chooser = NULL;
+  }
+}
+
+static void
+on_extra_options_button_clicked (CcRemovableMediaPanel *self)
+{
+  CcShell *shell = cc_panel_get_shell (CC_PANEL (self));
+  GtkWidget *toplevel = cc_shell_get_toplevel (shell);
+
+  gtk_window_set_transient_for (GTK_WINDOW (self->other_type_dialog), GTK_WINDOW (toplevel));
+  gtk_window_set_modal (GTK_WINDOW (self->other_type_dialog), TRUE);
+  gtk_window_set_title (GTK_WINDOW (self->other_type_dialog), _("Other Media"));
+  /* update other_application_chooser */
+  on_other_type_combo_box_changed (self);
+  gtk_window_present (GTK_WINDOW (self->other_type_dialog));
+}
+
+#define OFFSET(x)             (G_STRUCT_OFFSET (CcRemovableMediaPanel, x))
+#define WIDGET_FROM_OFFSET(x) (G_STRUCT_MEMBER (GtkWidget*, self, x))
+
+static void
+info_panel_setup_media (CcRemovableMediaPanel *self)
+{
+  guint n;
+  GList *l, *content_types;
+  GtkTreeIter iter;
+
+  struct {
+    gint widget_offset;
+    const gchar *content_type;
+    const gchar *heading;
+  } const defs[] = {
+    { OFFSET (audio_cdda_chooser), "x-content/audio-cdda", N_("Select an application for audio CDs") },
+    { OFFSET (video_dvd_chooser), "x-content/video-dvd", N_("Select an application for video DVDs") },
+    { OFFSET (music_player_chooser), "x-content/audio-player", N_("Select an application to run when a music player is connected") },
+    { OFFSET (dcf_chooser), "x-content/image-dcf", N_("Select an application to run when a camera is connected") },
+    { OFFSET (software_chooser), "x-content/unix-software", N_("Select an application for software CDs") },
+  };
+
+  struct {
+    const gchar *content_type;
+    const gchar *description;
+  } const other_defs[] = {
+    /* translators: these strings are duplicates of shared-mime-info
+     * strings, just here to fix capitalization of the English originals.
+     * If the shared-mime-info translation works for your language,
+     * simply leave these untranslated.
+     */
+    { "x-content/audio-dvd", N_("audio DVD") },
+    { "x-content/blank-bd", N_("blank Blu-ray disc") },
+    { "x-content/blank-cd", N_("blank CD disc") },
+    { "x-content/blank-dvd", N_("blank DVD disc") },
+    { "x-content/blank-hddvd", N_("blank HD DVD disc") },
+    { "x-content/video-bluray", N_("Blu-ray video disc") },
+    { "x-content/ebook-reader", N_("e-book reader") },
+    { "x-content/video-hddvd", N_("HD DVD video disc") },
+    { "x-content/image-picturecd", N_("Picture CD") },
+    { "x-content/video-svcd", N_("Super Video CD") },
+    { "x-content/video-vcd", N_("Video CD") },
+    { "x-content/win32-software", N_("Windows software") },
+  };
+
+  for (n = 0; n < G_N_ELEMENTS (defs); n++) {
+    prepare_chooser (self,
+                     GTK_APP_CHOOSER_BUTTON (WIDGET_FROM_OFFSET (defs[n].widget_offset)),
+                     defs[n].heading);
+  }
+
+  gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (self->other_type_list_store),
+                                        1, GTK_SORT_ASCENDING);
+
+
+  content_types = g_content_types_get_registered ();
+
+  for (l = content_types; l != NULL; l = l->next) {
+    char *content_type = l->data;
+    g_autofree char *description = NULL;
+
+    if (!g_str_has_prefix (content_type, "x-content/"))
+      continue;
+
+    for (n = 0; n < G_N_ELEMENTS (defs); n++) {
+      if (g_content_type_is_a (content_type, defs[n].content_type)) {
+        goto skip;
+      }
+    }
+
+    for (n = 0; n < G_N_ELEMENTS (other_defs); n++) {
+       if (strcmp (content_type, other_defs[n].content_type) == 0) {
+         const gchar *s = other_defs[n].description;
+         if (s == _(s))
+           description = g_content_type_get_description (content_type);
+         else
+           description = g_strdup (_(s));
+
+         break;
+       }
+    }
+
+    if (description == NULL) {
+      g_debug ("Content type '%s' is missing from the info panel", content_type);
+      description = g_content_type_get_description (content_type);
+    }
+
+    gtk_list_store_append (self->other_type_list_store, &iter);
+
+    gtk_list_store_set (self->other_type_list_store, &iter,
+                        0, description,
+                        1, content_type,
+                        -1);
+  skip:
+    ;
+  }
+
+  g_list_free_full (content_types, g_free);
+
+  gtk_combo_box_set_active (self->other_type_combo_box, 0);
+
+  g_settings_bind (self->settings,
+                   PREF_MEDIA_AUTORUN_NEVER,
+                   self->autorun_never_checkbutton,
+                   "active",
+                   G_SETTINGS_BIND_DEFAULT);
+
+  g_settings_bind (self->settings,
+                   PREF_MEDIA_AUTORUN_NEVER,
+                   self->handlers_box,
+                   "sensitive",
+                   G_SETTINGS_BIND_INVERT_BOOLEAN);
+}
+
+
+static void
+cc_removable_media_panel_finalize (GObject *object)
+{
+  CcRemovableMediaPanel *self = CC_REMOVABLE_MEDIA_PANEL (object);
+
+  g_clear_object (&self->settings);
+
+  G_OBJECT_CLASS (cc_removable_media_panel_parent_class)->finalize (object);
+}
+
+static void
+cc_removable_media_panel_dispose (GObject *object)
+{
+  CcRemovableMediaPanel *self = CC_REMOVABLE_MEDIA_PANEL (object);
+
+  g_clear_pointer ((GtkWindow **) &self->other_type_dialog, gtk_window_destroy);
+
+  G_OBJECT_CLASS (cc_removable_media_panel_parent_class)->dispose (object);
+}
+
+static void
+cc_removable_media_panel_class_init (CcRemovableMediaPanelClass *klass)
+{
+  GObjectClass   *object_class = G_OBJECT_CLASS (klass);
+  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+
+  object_class->finalize = cc_removable_media_panel_finalize;
+  object_class->dispose = cc_removable_media_panel_dispose;
+
+  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/removable-media/cc-removable-media-panel.ui");
+
+  gtk_widget_class_bind_template_child (widget_class, CcRemovableMediaPanel, audio_cdda_chooser);
+  gtk_widget_class_bind_template_child (widget_class, CcRemovableMediaPanel, autorun_never_checkbutton);
+  gtk_widget_class_bind_template_child (widget_class, CcRemovableMediaPanel, dcf_chooser);
+  gtk_widget_class_bind_template_child (widget_class, CcRemovableMediaPanel, extra_options_button);
+  gtk_widget_class_bind_template_child (widget_class, CcRemovableMediaPanel, handlers_box);
+  gtk_widget_class_bind_template_child (widget_class, CcRemovableMediaPanel, music_player_chooser);
+  gtk_widget_class_bind_template_child (widget_class, CcRemovableMediaPanel, other_type_dialog);
+  gtk_widget_class_bind_template_child (widget_class, CcRemovableMediaPanel, other_action_box);
+  gtk_widget_class_bind_template_child (widget_class, CcRemovableMediaPanel, other_action_label);
+  gtk_widget_class_bind_template_child (widget_class, CcRemovableMediaPanel, other_type_combo_box);
+  gtk_widget_class_bind_template_child (widget_class, CcRemovableMediaPanel, other_type_list_store);
+  gtk_widget_class_bind_template_child (widget_class, CcRemovableMediaPanel, software_chooser);
+  gtk_widget_class_bind_template_child (widget_class, CcRemovableMediaPanel, video_dvd_chooser);
+
+  gtk_widget_class_bind_template_callback (widget_class, on_extra_options_dialog_response);
+  gtk_widget_class_bind_template_callback (widget_class, on_extra_options_button_clicked);
+  gtk_widget_class_bind_template_callback (widget_class, on_other_type_combo_box_changed);
+}
+
+static void
+cc_removable_media_panel_init (CcRemovableMediaPanel *self)
+{
+  g_resources_register (cc_removable_media_get_resource ());
+
+  gtk_widget_init_template (GTK_WIDGET (self));
+  self->settings = g_settings_new (MEDIA_HANDLING_SCHEMA);
+
+  info_panel_setup_media (self);
+}
diff --git a/panels/removable-media/cc-removable-media-panel.h b/panels/removable-media/cc-removable-media-panel.h
new file mode 100644
index 0000000..f6d4b53
--- /dev/null
+++ b/panels/removable-media/cc-removable-media-panel.h
@@ -0,0 +1,29 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
+ *
+ * Copyright (C) 2017 Mohammed Sadiq <sadiq@sadiqpk.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#pragma once
+
+#include <shell/cc-panel.h>
+
+G_BEGIN_DECLS
+
+#define CC_TYPE_REMOVABLE_MEDIA_PANEL (cc_removable_media_panel_get_type ())
+G_DECLARE_FINAL_TYPE (CcRemovableMediaPanel, cc_removable_media_panel, CC, REMOVABLE_MEDIA_PANEL, CcPanel)
+
+G_END_DECLS
diff --git a/panels/removable-media/cc-removable-media-panel.ui b/panels/removable-media/cc-removable-media-panel.ui
new file mode 100644
index 0000000..899956e
--- /dev/null
+++ b/panels/removable-media/cc-removable-media-panel.ui
@@ -0,0 +1,304 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <!-- interface-requires gtk+ 3.0 -->
+  <template class="CcRemovableMediaPanel" parent="CcPanel">
+    <child type="content">
+      <object class="AdwClamp">
+        <child>
+          <object class="GtkBox">
+            <property name="hexpand">True</property>
+            <property name="vexpand">True</property>
+            <property name="margin_top">32</property>
+            <property name="margin_bottom">32</property>
+            <property name="margin_start">24</property>
+            <property name="margin_end">24</property>
+            <property name="spacing">18</property>
+            <property name="orientation">vertical</property>
+            <child>
+              <object class="GtkBox" id="handlers_box">
+                <property name="spacing">10</property>
+                <property name="valign">start</property>
+                <property name="vexpand">False</property>
+                <property name="orientation">vertical</property>
+                <child>
+                  <object class="GtkBox">
+                    <property name="spacing">10</property>
+                    <property name="orientation">vertical</property>
+                    <child>
+                      <object class="GtkLabel">
+                        <property name="halign">center</property>
+                        <property name="justify">center</property>
+                        <property name="wrap">True</property>
+                        <property name="label" translatable="yes">Select how media should be handled</property>
+                        <property name="margin_bottom">12</property>
+                        <style>
+                          <class name="dim-label"/>
+                        </style>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkBox">
+                        <property name="spacing">18</property>
+                        <property name="margin-start">12</property>
+                        <property name="orientation">vertical</property>
+                        <child>
+                          <object class="GtkGrid">
+                            <property name="hexpand">True</property>
+                            <property name="column-spacing">6</property>
+                            <property name="row-spacing">12</property>
+                            <child>
+                              <object class="GtkLabel">
+                                <property name="xalign">1</property>
+                                <property name="label" translatable="yes">CD _audio</property>
+                                <property name="use_underline">True</property>
+                                <property name="mnemonic_widget">audio_cdda_chooser</property>
+                                <layout>
+                                  <property name="row">0</property>
+                                  <property name="column">0</property>
+                                </layout>
+                                <style>
+                                 <class name="dim-label"/>
+                                </style>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkLabel">
+                                <property name="xalign">1</property>
+                                <property name="label" translatable="yes">_DVD video</property>
+                                <property name="use_underline">True</property>
+                                <property name="mnemonic_widget">video_dvd_chooser</property>
+                                <layout>
+                                  <property name="row">1</property>
+                                  <property name="column">0</property>
+                                </layout>
+                                <style>
+                                 <class name="dim-label"/>
+                                </style>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkAppChooserButton" id="audio_cdda_chooser">
+                                <property name="hexpand">True</property>
+                                <property name="content_type">x-content/audio-cdda</property>
+                                <layout>
+                                  <property name="row">0</property>
+                                  <property name="column">1</property>
+                                </layout>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkAppChooserButton" id="video_dvd_chooser">
+                                <property name="hexpand">True</property>
+                                <property name="content_type">x-content/video-dvd</property>
+                                <layout>
+                                  <property name="row">1</property>
+                                  <property name="column">1</property>
+                                </layout>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkLabel">
+                                <property name="xalign">1</property>
+                                <property name="label" translatable="yes">_Music player</property>
+                                <property name="use_underline">True</property>
+                                <property name="mnemonic_widget">music_player_chooser</property>
+                                <layout>
+                                  <property name="row">2</property>
+                                  <property name="column">0</property>
+                                </layout>
+                                <style>
+                                 <class name="dim-label"/>
+                                </style>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkAppChooserButton" id="music_player_chooser">
+                                <property name="hexpand">True</property>
+                                <property name="content_type">x-content/audio-player</property>
+                                <layout>
+                                  <property name="row">2</property>
+                                  <property name="column">1</property>
+                                </layout>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkLabel">
+                                <property name="xalign">1</property>
+                                <property name="label" translatable="yes">_Photos</property>
+                                <property name="use_underline">True</property>
+                                <property name="mnemonic_widget">dcf_chooser</property>
+                                <layout>
+                                  <property name="row">3</property>
+                                  <property name="column">0</property>
+                                </layout>
+                                <style>
+                                 <class name="dim-label"/>
+                                </style>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkAppChooserButton" id="dcf_chooser">
+                                <property name="hexpand">True</property>
+                                <property name="content_type">x-content/image-dcf</property>
+                                <layout>
+                                  <property name="row">3</property>
+                                  <property name="column">1</property>
+                                </layout>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkLabel">
+                                <property name="xalign">1</property>
+                                <property name="label" translatable="yes">_Software</property>
+                                <property name="use_underline">True</property>
+                                <property name="mnemonic_widget">software_chooser</property>
+                                <layout>
+                                  <property name="row">4</property>
+                                  <property name="column">0</property>
+                                </layout>
+                                <style>
+                                 <class name="dim-label"/>
+                                </style>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkAppChooserButton" id="software_chooser">
+                                <property name="hexpand">True</property>
+                                <property name="content_type">x-content/unix-software</property>
+                                <layout>
+                                  <property name="row">4</property>
+                                  <property name="column">1</property>
+                                </layout>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkButton" id="extra_options_button">
+                            <property name="label" translatable="yes">_Other Media…</property>
+                            <property name="halign">end</property>
+                            <property name="use_underline">True</property>
+                            <signal name="clicked" handler="on_extra_options_button_clicked" object="CcRemovableMediaPanel" swapped="yes"/>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child>
+              <object class="GtkCheckButton" id="autorun_never_checkbutton">
+                <property name="valign">end</property>
+                <property name="vexpand">False</property>
+                <property name="use_underline">True</property>
+                <property name="label" translatable="yes">_Never prompt or start programs on media insertion</property>
+              </object>
+            </child>
+          </object>
+        </child>
+      </object>
+    </child>
+  </template>
+
+  <object class="GtkDialog" id="other_type_dialog">
+    <property name="resizable">False</property>
+    <property name="modal">True</property>
+    <property name="destroy_with_parent">True</property>
+    <property name="use_header_bar">1</property>
+    <property name="hide-on-close">True</property>
+    <signal name="response" handler="on_extra_options_dialog_response" object="CcRemovableMediaPanel" swapped="yes"/>
+    <child>
+      <object class="GtkBox">
+        <property name="margin-top">18</property>
+        <property name="margin-bottom">18</property>
+        <property name="margin-start">18</property>
+        <property name="margin-end">18</property>
+        <property name="orientation">vertical</property>
+        <child>
+          <object class="GtkBox">
+            <property name="spacing">10</property>
+            <property name="orientation">vertical</property>
+            <child>
+              <object class="GtkLabel">
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">Select how other media should be handled</property>
+                <attributes>
+                  <attribute name="weight" value="bold"/>
+                </attributes>
+              </object>
+            </child>
+            <child>
+              <object class="GtkBox">
+                <property name="spacing">6</property>
+                <property name="margin-start">12</property>
+                <property name="orientation">vertical</property>
+                <child>
+                  <object class="GtkGrid">
+                    <property name="column_spacing">6</property>
+                    <property name="row_spacing">10</property>
+                    <child>
+                      <object class="GtkComboBox" id="other_type_combo_box">
+                        <property name="model">other_type_list_store</property>
+                        <signal name="changed" handler="on_other_type_combo_box_changed" object="CcRemovableMediaPanel" swapped="yes"/>
+                        <layout>
+                          <property name="column">1</property>
+                          <property name="row">0</property>
+                        </layout>
+                        <child>
+                          <object class="GtkCellRendererText"/>
+                          <attributes>
+                            <attribute name="text">0</attribute>
+                          </attributes>
+                        </child>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="other_action_label">
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">_Action:</property>
+                        <property name="use_underline">True</property>
+                        <layout>
+                          <property name="column">0</property>
+                          <property name="row">1</property>
+                        </layout>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkBox" id="other_action_box">
+                        <layout>
+                          <property name="column">1</property>
+                          <property name="row">1</property>
+                        </layout>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkLabel">
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">_Type:</property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">other_type_combo_box</property>
+                        <layout>
+                          <property name="column">0</property>
+                          <property name="row">0</property>
+                        </layout>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+          </object>
+        </child>
+      </object>
+    </child>
+  </object>
+  <object class="GtkListStore" id="other_type_list_store">
+    <columns>
+      <!-- column-name description -->
+      <column type="gchararray"/>
+      <!-- column-name content-type -->
+      <column type="gchararray"/>
+    </columns>
+  </object>
+</interface>
diff --git a/panels/removable-media/gnome-removable-media-panel.desktop.in.in b/panels/removable-media/gnome-removable-media-panel.desktop.in.in
new file mode 100644
index 0000000..0f5a6d1
--- /dev/null
+++ b/panels/removable-media/gnome-removable-media-panel.desktop.in.in
@@ -0,0 +1,18 @@
+[Desktop Entry]
+Name=Removable Media
+Comment=Configure Removable Media settings
+Exec=gnome-control-center removable-media
+# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+Icon=org.gnome.Settings-removable-media-symbolic
+Terminal=false
+Type=Application
+NoDisplay=true
+StartupNotify=true
+Categories=GNOME;GTK;Settings;X-GNOME-Settings-Panel;X-GNOME-DevicesSettings;
+OnlyShowIn=GNOME;Unity;
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=gnome-control-center
+X-GNOME-Bugzilla-Component=info
+X-GNOME-Bugzilla-Version=@VERSION@
+# Translators: Search terms to find the Removable Media panel. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+Keywords=device;system;default;application;preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;
diff --git a/panels/removable-media/icons/meson.build b/panels/removable-media/icons/meson.build
new file mode 100644
index 0000000..b03db66
--- /dev/null
+++ b/panels/removable-media/icons/meson.build
@@ -0,0 +1,4 @@
+install_data(
+  'scalable/org.gnome.Settings-removable-media-symbolic.svg',
+  install_dir: join_paths(control_center_icondir, 'hicolor', 'scalable', 'apps')
+)
diff --git a/panels/removable-media/icons/scalable/org.gnome.Settings-removable-media-symbolic.svg b/panels/removable-media/icons/scalable/org.gnome.Settings-removable-media-symbolic.svg
new file mode 100644
index 0000000..1e31db3
--- /dev/null
+++ b/panels/removable-media/icons/scalable/org.gnome.Settings-removable-media-symbolic.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="16px" viewBox="0 0 16 16" width="16px" xmlns="http://www.w3.org/2000/svg">
+    <path d="m 12 6 v 5 c 0 2.210938 -1.789062 4 -4 4 s -4 -1.789062 -4 -4 v -5 c 0 -0.550781 0.449219 -1 1 -1 h 6 c 0.550781 0 1 0.449219 1 1 z m -7 -5.5 v 3.5 h 6 v -3.5 c 0 -0.277344 -0.222656 -0.5 -0.5 -0.5 h -5 c -0.277344 0 -0.5 0.222656 -0.5 0.5 z m 1 0.5 h 1 v 1 h -1 z m 3 0 h 1 v 1 h -1 z m 0 0" fill="#474747"/>
+</svg>
diff --git a/panels/removable-media/meson.build b/panels/removable-media/meson.build
new file mode 100644
index 0000000..6475659
--- /dev/null
+++ b/panels/removable-media/meson.build
@@ -0,0 +1,47 @@
+panels_list += cappletname
+desktop = 'gnome-@0@-panel.desktop'.format(cappletname)
+
+desktop_in = configure_file(
+  input: desktop + '.in.in',
+  output: desktop + '.in',
+  configuration: desktop_conf
+)
+
+i18n.merge_file(
+  type: 'desktop',
+  input: desktop_in,
+  output: desktop,
+  po_dir: po_dir,
+  install: true,
+  install_dir: control_center_desktopdir
+)
+
+sources = files(
+  'cc-removable-media-panel.c'
+)
+
+resource_data = files(
+  'cc-removable-media-panel.ui'
+)
+
+sources += gnome.compile_resources(
+  'cc-' + cappletname + '-resources',
+  cappletname + '.gresource.xml',
+  c_name: 'cc_' + cappletname.underscorify (),
+  dependencies: resource_data,
+  export: true
+)
+
+deps = common_deps + [
+  dependency('libgtop-2.0')
+]
+
+panels_libs += static_library(
+  cappletname,
+  sources: sources,
+  include_directories: [ top_inc, common_inc ],
+  dependencies: deps,
+  c_args: cflags
+)
+
+subdir('icons')
diff --git a/panels/removable-media/removable-media.gresource.xml b/panels/removable-media/removable-media.gresource.xml
new file mode 100644
index 0000000..330dbf2
--- /dev/null
+++ b/panels/removable-media/removable-media.gresource.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/gnome/control-center/removable-media">
+    <file preprocess="xml-stripblanks">cc-removable-media-panel.ui</file>
+  </gresource>
+</gresources>