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

Proposed by Robert Ancell on 2016-03-09
Status: Merged
Approved by: Dmitry Shachnev on 2016-03-15
Approved revision: 12852
Merged at revision: 12854
Proposed branch: lp:~robert-ancell/unity-control-center/always-legal-notice
Merge into: lp:unity-control-center
Diff against target: 31 lines (+5/-9)
1 file modified
panels/info/cc-info-panel.c (+5/-9)
To merge this branch: bzr merge lp:~robert-ancell/unity-control-center/always-legal-notice
Reviewer Review Type Date Requested Status
Sebastien Bacher 2016-03-09 Approve on 2016-03-15
Review via email: mp+288577@code.launchpad.net

Commit message

Always show the legal notice.

To post a comment you must log in.
Sebastien Bacher (seb128) wrote :

thanks

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1415 _("Removable Media"),1415 _("Removable Media"),
1416 -1);1416 -1);
14171417
1418 if (!g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "Unity"))1418 gtk_list_store_append (model, &iter);
1419 {1419 gtk_list_store_set (model, &iter, section_name_column,
1420 gtk_list_store_append (model, &iter);1420 _("Legal Notice"),
1421 gtk_list_store_set (model, &iter, section_name_column,1421 -1);
1422 _("Legal Notice"),
1423 -1);
1424 }
14251422
1426 g_signal_connect (selection, "changed",1423 g_signal_connect (selection, "changed",
1427 G_CALLBACK (on_section_changed), self);1424 G_CALLBACK (on_section_changed), self);
@@ -1947,8 +1944,7 @@
1947 info_panel_setup_overview (self);1944 info_panel_setup_overview (self);
1948 info_panel_setup_default_apps (self);1945 info_panel_setup_default_apps (self);
1949 info_panel_setup_media (self);1946 info_panel_setup_media (self);
1950 if (!g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "Unity"))1947 info_panel_setup_notice (self);
1951 info_panel_setup_notice (self);
1952}1948}
19531949
1954void1950void

Subscribers

People subscribed via source and target branches