diff --git a/panels/camera/cc-camera-panel.c b/panels/camera/cc-camera-panel.c index 516aae02f..86fef1baf 100644 --- a/panels/camera/cc-camera-panel.c +++ b/panels/camera/cc-camera-panel.c @@ -18,7 +18,6 @@ * Author: Matthias Clasen */ -#include "list-box-helper.h" #include "cc-camera-panel.h" #include "cc-camera-resources.h" #include "cc-util.h" @@ -174,40 +173,36 @@ add_camera_app (CcCameraPanel *self, return; row = gtk_list_box_row_new (); - gtk_widget_show (row); box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); - gtk_widget_show (box); gtk_widget_set_margin_start (box, 12); gtk_widget_set_margin_end (box, 6); gtk_widget_set_margin_top (box, 12); gtk_widget_set_margin_bottom (box, 12); - gtk_container_add (GTK_CONTAINER (row), box); + gtk_list_box_row_set_child (GTK_LIST_BOX_ROW (row), box); gtk_widget_set_hexpand (box, TRUE); - gtk_container_add (GTK_CONTAINER (self->camera_apps_list_box), row); + gtk_list_box_append (self->camera_apps_list_box, row); icon = g_app_info_get_icon (G_APP_INFO (app_info)); - w = gtk_image_new_from_gicon (icon, GTK_ICON_SIZE_LARGE_TOOLBAR); - gtk_widget_show (w); + w = gtk_image_new_from_gicon (icon); gtk_widget_set_halign (w, GTK_ALIGN_CENTER); gtk_widget_set_valign (w, GTK_ALIGN_CENTER); gtk_size_group_add_widget (self->camera_icon_size_group, w); - gtk_box_pack_start (GTK_BOX (box), w, FALSE, FALSE, 0); + gtk_box_append (GTK_BOX (box), w); w = gtk_label_new (g_app_info_get_name (G_APP_INFO (app_info))); - gtk_widget_show (w); + gtk_widget_set_hexpand (w, TRUE); gtk_widget_set_margin_start (w, 12); gtk_widget_set_margin_end (w, 12); gtk_widget_set_halign (w, GTK_ALIGN_START); gtk_widget_set_valign (w, GTK_ALIGN_CENTER); gtk_label_set_xalign (GTK_LABEL (w), 0); - gtk_box_pack_start (GTK_BOX (box), w, TRUE, TRUE, 0); + gtk_box_append (GTK_BOX (box), w); w = gtk_switch_new (); - gtk_widget_show (w); gtk_switch_set_active (GTK_SWITCH (w), enabled); gtk_widget_set_halign (w, GTK_ALIGN_END); gtk_widget_set_valign (w, GTK_ALIGN_CENTER); - gtk_box_pack_start (GTK_BOX (box), w, FALSE, FALSE, 0); + gtk_box_append (GTK_BOX (box), w); g_settings_bind (self->privacy_settings, "disable-camera", w, @@ -391,7 +386,7 @@ cc_camera_panel_constructed (GObject *object) widget = gtk_switch_new (); gtk_widget_show (widget); gtk_widget_set_valign (widget, GTK_ALIGN_CENTER); - gtk_box_pack_start (GTK_BOX (box), widget, FALSE, FALSE, 4); + gtk_box_append (GTK_BOX (box), widget); g_settings_bind (self->privacy_settings, "disable-camera", widget, "active", @@ -433,10 +428,6 @@ cc_camera_panel_init (CcCameraPanel *self) gtk_widget_init_template (GTK_WIDGET (self)); - gtk_list_box_set_header_func (self->camera_apps_list_box, - cc_list_box_update_header_func, - NULL, - NULL); self->camera_icon_size_group = gtk_size_group_new (GTK_SIZE_GROUP_BOTH); self->privacy_settings = g_settings_new ("org.gnome.desktop.privacy"); diff --git a/panels/camera/cc-camera-panel.ui b/panels/camera/cc-camera-panel.ui index 8d87bbd61..281fed1f9 100644 --- a/panels/camera/cc-camera-panel.ui +++ b/panels/camera/cc-camera-panel.ui @@ -3,125 +3,119 @@ diff --git a/panels/meson.build b/panels/meson.build index 518207ddd..e25f7a549 100644 --- a/panels/meson.build +++ b/panels/meson.build @@ -3,7 +3,7 @@ subdir('common') panels = [ # 'applications', # 'background', -# 'camera', + 'camera', # 'color', # 'datetime', # 'default-apps', diff --git a/shell/cc-panel-loader.c b/shell/cc-panel-loader.c index 8c5647668..b9bead778 100644 --- a/shell/cc-panel-loader.c +++ b/shell/cc-panel-loader.c @@ -69,7 +69,7 @@ extern GType cc_notifications_panel_get_type (void); //extern GType cc_wwan_panel_get_type (void); #endif /* BUILD_WWAN */ //extern GType cc_location_panel_get_type (void); -//extern GType cc_camera_panel_get_type (void); +extern GType cc_camera_panel_get_type (void); //extern GType cc_microphone_panel_get_type (void); //extern GType cc_usage_panel_get_type (void); //extern GType cc_lock_panel_get_type (void); @@ -102,7 +102,7 @@ static CcPanelLoaderVtable default_panels[] = #ifdef BUILD_BLUETOOTH //PANEL_TYPE("bluetooth", cc_bluetooth_panel_get_type, NULL), #endif - //PANEL_TYPE("camera", cc_camera_panel_get_type, NULL), + PANEL_TYPE("camera", cc_camera_panel_get_type, NULL), //PANEL_TYPE("color", cc_color_panel_get_type, NULL), //PANEL_TYPE("datetime", cc_date_time_panel_get_type, NULL), //PANEL_TYPE("default-apps", cc_default_apps_panel_get_type, NULL),