Merge lp:~robert-ancell/unity-control-center/always-legal-notice into lp:unity-control-center

[Robert Ancell]

Always show the legal notice.

[Sebastien Bacher (seb128)]

thanks

review: Approve

=== modified file 'panels/info/cc-info-panel.c'
--- panels/info/cc-info-panel.c	2016-01-14 09:26:05 +0000
+++ panels/info/cc-info-panel.c	2016-03-09 22:24:08 +0000
@@ -1415,13 +1415,10 @@
                       _("Removable Media"),
                       -1);
 
-  if (!g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "Unity"))
-    {
-      gtk_list_store_append (model, &iter);
-      gtk_list_store_set (model, &iter, section_name_column,
-                          _("Legal Notice"),
-                          -1);
-    }
+  gtk_list_store_append (model, &iter);
+  gtk_list_store_set (model, &iter, section_name_column,
+                      _("Legal Notice"),
+                      -1);
 
   g_signal_connect (selection, "changed",
                     G_CALLBACK (on_section_changed), self);
@@ -1947,8 +1944,7 @@
   info_panel_setup_overview (self);
   info_panel_setup_default_apps (self);
   info_panel_setup_media (self);
-  if (!g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "Unity"))
-    info_panel_setup_notice (self);
+  info_panel_setup_notice (self);
 }
 
 void