desktop: Remove commiting code for the panel

[src/agl-compositor.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 306ad6e..2bbb800 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -46,6 +46,7 @@
 #include <libweston/windowed-output-api.h>
 #include <libweston/config-parser.h>
 #include <libweston/weston-log.h>
+#include <weston/weston.h>
 
 #include "shared/os-compatibility.h"
 #include "shared/helpers.h"
@@ -85,6 +86,20 @@ to_ivi_output(struct weston_output *o)
        return output;
 }
 
+static void
+ivi_output_configure_app_id(struct ivi_output *ivi_output)
+{
+       if (ivi_output->config) {
+               if (ivi_output->app_id != NULL)
+                       return;
+
+               weston_config_section_get_string(ivi_output->config,
+                                                "agl-shell-app-id",
+                                                &ivi_output->app_id,
+                                                NULL);
+       }
+}
+
 static struct ivi_output *
 ivi_ensure_output(struct ivi_compositor *ivi, char *name,
                  struct weston_config_section *config)
@@ -119,6 +134,7 @@ ivi_ensure_output(struct ivi_compositor *ivi, char *name,
                                           &output->output_destroy);
 
        wl_list_insert(&ivi->outputs, &output->link);
+       ivi_output_configure_app_id(output);
        return output;
 }
 
@@ -1126,20 +1142,6 @@ usage(int error_code)
        exit(error_code);
 }
 
-static void
-ivi_compositor_get_quirks(struct ivi_compositor *ivi)
-{
-       struct weston_config_section *section;
-
-       if (!ivi->config)
-               return;
-
-       section = weston_config_get_section(ivi->config, "shell", NULL, NULL);
-       weston_config_section_get_bool(section, "activate-by-default",
-                       &ivi->quirks.activate_apps_by_default, 0);
-
-}
-
 int main(int argc, char *argv[])
 {
        struct ivi_compositor ivi = { 0 };
@@ -1217,8 +1219,6 @@ int main(int argc, char *argv[])
                        backend = choose_default_backend();
        }
 
-       ivi_compositor_get_quirks(&ivi);
-
        display = wl_display_create();
        loop = wl_display_get_event_loop(display);