Merge lp:~robert-ancell/unity-control-center/xdg-current-desktop into lp:unity-control-center

[Robert Ancell]

Don't check if we're running under Unity - we only support Unity

[Iain Lane (laney)]

Makes sense.

unity-settings-daemon is used for Flashback (at least ATM), so I didn't do the same there.

review: Approve

=== modified file 'panels/display/cc-display-panel.c'
--- panels/display/cc-display-panel.c	2016-03-09 21:55:46 +0000
+++ panels/display/cc-display-panel.c	2016-10-03 03:56:43 +0000
@@ -271,12 +271,6 @@
 }
 
 static gboolean
-is_unity_session (void)
-{
-  return (g_strcmp0 (g_getenv("XDG_CURRENT_DESKTOP"), "Unity") == 0);
-}
-
-static gboolean
 should_show_resolution (gint output_width,
                         gint output_height,
                         gint width,
@@ -317,11 +311,8 @@
 
   select_current_output_from_dialog_position (self);
 
-  if (is_unity_session ())
-    {
-      refresh_unity_launcher_placement (self);
-      refresh_unity_monitor_scale (self);
-    }
+  refresh_unity_launcher_placement (self);
+  refresh_unity_monitor_scale (self);
 }
 
 static void
@@ -2286,80 +2277,23 @@
   cairo_restore (cr);
 
   /* Only display a launcher on all or primary monitor */
-  if (is_unity_session ())
-    {
-      if (gsd_rr_output_info_is_active (output) && (unity_launcher_on_all_monitors (self->priv->unity_settings) || gsd_rr_output_info_get_primary (output)))
-        {
-          cairo_rectangle (cr, x, y, 10, h * scale + 0.5);
-          cairo_set_source_rgb (cr, 0, 0, 0);
-          foo_scroll_area_add_input_from_fill (FOO_SCROLL_AREA (self->priv->area),
-                                               cr,
-                                               (FooScrollAreaEventFunc) on_top_bar_event,
-                                               self);
-          cairo_fill (cr);
-
-          cairo_set_source_rgb (cr, 0.25, 0.25, 0.25);
-          cairo_rectangle (cr, x + 1, y + 6, 8, 8);
-          cairo_rectangle (cr, x + 1, y + 16, 8, 8);
-          cairo_rectangle (cr, x + 1, y + 26, 8, 8);
-          cairo_rectangle (cr, x + 1, y + 36, 8, 8);
-          cairo_rectangle (cr, x + 1, y + h * scale + 0.5 - 10, 8, 8);
-          cairo_fill (cr);
-        }
-    }
-
-  if (gsd_rr_output_info_get_primary (output) && !is_unity_session ())
-    {
-      const char *clock_format;
-      char *text;
-      gboolean use_24;
-      GDateTime *dt;
-      GDesktopClockFormat value;
-
-      /* top bar */
-      cairo_rectangle (cr, x, y, w * scale + 0.5, TOP_BAR_HEIGHT);
+  if (gsd_rr_output_info_is_active (output) && (unity_launcher_on_all_monitors (self->priv->unity_settings) || gsd_rr_output_info_get_primary (output)))
+    {
+      cairo_rectangle (cr, x, y, 10, h * scale + 0.5);
       cairo_set_source_rgb (cr, 0, 0, 0);
       foo_scroll_area_add_input_from_fill (FOO_SCROLL_AREA (self->priv->area),
                                            cr,
                                            (FooScrollAreaEventFunc) on_top_bar_event,
                                            self);
-
-      cairo_fill (cr);
-
-      /* clock */
-      value = g_settings_get_enum (self->priv->clock_settings, CLOCK_FORMAT_KEY);
-      use_24 = value == G_DESKTOP_CLOCK_FORMAT_24H;
-      if (use_24)
-        clock_format = _("%a %R");
-      else
-        clock_format = _("%a %l:%M %p");
-
-      dt = g_date_time_new_now_local ();
-      text = g_date_time_format (dt, clock_format);
-      g_date_time_unref (dt);
-
-      layout = gtk_widget_create_pango_layout (GTK_WIDGET (self->priv->area), text);
-      g_free (text);
-      pango_layout_set_alignment (layout, PANGO_ALIGN_CENTER);
-
-      layout_set_font (layout, "Sans 4");
-      pango_layout_get_pixel_extents (layout, &ink_extent, &log_extent);
-
-      if (available_w < ink_extent.width)
-        factor = available_w / ink_extent.width;
-      else
-        factor = 1.0;
-
-      cairo_move_to (cr,
-                     x + ((w * scale + 0.5) - factor * log_extent.width) / 2,
-                     y + (TOP_BAR_HEIGHT - factor * log_extent.height) / 2);
-
-      cairo_scale (cr, factor, factor);
-
-      cairo_set_source_rgb (cr, 1.0, 1.0, 1.0);
-
-      pango_cairo_show_layout (cr, layout);
-      g_object_unref (layout);
+      cairo_fill (cr);
+
+      cairo_set_source_rgb (cr, 0.25, 0.25, 0.25);
+      cairo_rectangle (cr, x + 1, y + 6, 8, 8);
+      cairo_rectangle (cr, x + 1, y + 16, 8, 8);
+      cairo_rectangle (cr, x + 1, y + 26, 8, 8);
+      cairo_rectangle (cr, x + 1, y + 36, 8, 8);
+      cairo_rectangle (cr, x + 1, y + h * scale + 0.5 - 10, 8, 8);
+      cairo_fill (cr);
     }
 
   cairo_restore (cr);
@@ -3255,21 +3189,7 @@
                             "clicked", G_CALLBACK (apply), self);
 
   /* Unity settings */
-  if (is_unity_session ())
-    setup_unity_settings (self);
-  else
-    {
-      gtk_widget_hide (WID ("unity_launcher_placement_sep"));
-      gtk_widget_hide (WID ("launcher_placement_label"));
-      gtk_widget_hide (WID ("sticky_edge_label"));
-      gtk_widget_hide (WID ("launcher_placement_combo"));
-      gtk_widget_hide (WID ("stickyedge_switch"));
-      gtk_widget_hide (WID ("ui_scale_separator"));
-      gtk_widget_hide (WID ("ui_scale_label"));
-      gtk_widget_hide (WID ("ui_scale"));
-      gtk_widget_hide (WID ("ui_scale_monitor_label"));
-      gtk_widget_hide (WID ("ui_scale_monitor_combo"));
-    }
+  setup_unity_settings (self);
 
   gtk_widget_show (self->priv->panel);
   gtk_container_add (GTK_CONTAINER (self), self->priv->panel);

=== modified file 'panels/region/cc-region-panel.c'
--- panels/region/cc-region-panel.c	2016-03-09 21:55:46 +0000
+++ panels/region/cc-region-panel.c	2016-10-03 03:56:43 +0000
@@ -51,12 +51,6 @@
 #define INDICATOR_KEYBOARD_SCHEMA_ID "com.canonical.indicator.keyboard"
 
 static gboolean
-is_unity (void)
-{
-	return g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "Unity") == 0;
-}
-
-static gboolean
 is_fcitx_active (void)
 {
 	return g_strcmp0 (g_getenv ("GTK_IM_MODULE"), "fcitx") == 0;
@@ -67,9 +61,6 @@
 {
 	GSettingsSchema *schema;
 
-	if (!is_unity ())
-		return FALSE;
-
 	schema = g_settings_schema_source_lookup (g_settings_schema_source_get_default (), INDICATOR_KEYBOARD_SCHEMA_ID, TRUE);
 	if (schema) {
 		g_settings_schema_unref (schema);
@@ -196,24 +187,14 @@
 		return;
 	}
 
-	if (!is_unity ())
-		prefs_widget = (GtkWidget *) gtk_builder_get_object (priv->builder,
-								     "region_notebook");
-	else
-		prefs_widget = (GtkWidget *) gtk_builder_get_object (priv->builder,
-								     "vbox5");
+	prefs_widget = (GtkWidget *) gtk_builder_get_object (priv->builder,
+							     "vbox5");
 
 	gtk_widget_set_size_request (GTK_WIDGET (prefs_widget), -1, 400);
 
 	gtk_widget_reparent (prefs_widget, GTK_WIDGET (self));
 
         setup_input_tabs (priv->builder, self);
-
-	if (!is_unity ()) {
-		setup_language (priv->builder);
-		setup_formats (priv->builder);
-		setup_system (priv->builder);
-	}
 }
 
 void

=== modified file 'panels/region/gnome-region-panel-input.c'
--- panels/region/gnome-region-panel-input.c	2015-09-02 13:30:14 +0000
+++ panels/region/gnome-region-panel-input.c	2016-10-03 03:56:43 +0000
@@ -144,19 +144,10 @@
 static GtkTreeModel *tree_view_get_actual_model (GtkTreeView *tv);
 
 static gboolean
-is_unity (void)
-{
-  return g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "Unity") == 0;
-}
-
-static gboolean
 has_indicator_keyboard (void)
 {
 	GSettingsSchema *schema;
 
-	if (!is_unity ())
-		return FALSE;
-
 	schema = g_settings_schema_source_lookup (g_settings_schema_source_get_default (), INDICATOR_KEYBOARD_SCHEMA_ID, TRUE);
 	if (schema) {
 		g_settings_schema_unref (schema);

=== modified file 'panels/universal-access/cc-ua-panel.c'
--- panels/universal-access/cc-ua-panel.c	2016-03-15 20:34:01 +0000
+++ panels/universal-access/cc-ua-panel.c	2016-10-03 03:56:43 +0000
@@ -91,12 +91,6 @@
     }
 }
 
-static gboolean
-is_unity_session (void)
-{
-  return (g_strcmp0 (g_getenv("XDG_CURRENT_DESKTOP"), "Unity") == 0);
-}
-
 static void
 cc_ua_panel_dispose (GObject *object)
 {
@@ -377,9 +371,7 @@
     }
   else
     {
-      const gchar *key = is_unity_session () ? KEY_UNITY_TEXT_SCALE_FACTOR :
-                                               KEY_TEXT_SCALING_FACTOR;
-      g_settings_reset (settings, key);
+      g_settings_reset (settings, KEY_UNITY_TEXT_SCALE_FACTOR);
     }
 
   return ret;
@@ -467,20 +459,8 @@
                    WID (priv->builder, "seeing_toggle_keys_switch"), "active",
                    G_SETTINGS_BIND_DEFAULT);
 
-  if (g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "Unity")) 
-  {
-    priv->shell_watch_id = g_bus_watch_name (G_BUS_TYPE_SESSION,
-					   "org.gnome.Shell",
-					   G_BUS_NAME_WATCHER_FLAGS_NONE,
-					   (GBusNameAppearedCallback) shell_appeared_cb,
-					   (GBusNameVanishedCallback) shell_vanished_cb,
-					   self,
-					   NULL);
-  } else
-  {
-    gtk_widget_hide (WID (priv->builder, "zoom_label_box"));
-    gtk_widget_hide (WID (priv->builder, "zoom_value_box"));
-  }
+  gtk_widget_hide (WID (priv->builder, "zoom_label_box"));
+  gtk_widget_hide (WID (priv->builder, "zoom_value_box"));
 
   g_signal_connect (WID (priv->builder, "seeing_zoom_preferences_button"),
                     "clicked",
@@ -738,9 +718,7 @@
   priv->application_settings = g_settings_new ("org.gnome.desktop.a11y.applications");
   priv->mediakeys_settings = g_settings_new ("org.gnome.settings-daemon.plugins.media-keys");
   priv->a11y_profile_settings = g_settings_new ("org.gnome.desktop.a11y");
-
-  if (is_unity_session ())
-    priv->unity_interface_settings = g_settings_new ("com.canonical.Unity.Interface");
+  priv->unity_interface_settings = g_settings_new ("com.canonical.Unity.Interface");
 
   cc_ua_panel_init_keyboard (self);
   cc_ua_panel_init_mouse (self);

=== modified file 'shell/control-center.c'
--- shell/control-center.c	2016-03-15 20:34:36 +0000
+++ shell/control-center.c	2016-10-03 03:56:43 +0000
@@ -303,7 +303,6 @@
   gtk_icon_size_register ("cc-sidebar-list", 24, 24);
 
   notify_init ("gnome-control-center");
-  g_setenv ("XDG_CURRENT_DESKTOP", "Unity", FALSE);
 
   shell = gnome_control_center_new ();