1
=== modified file 'src/dm-plugin/dm-source.cpp'
2
--- src/dm-plugin/dm-source.cpp	2015-12-16 19:32:40 +0000
3
+++ src/dm-plugin/dm-source.cpp	2016-12-02 16:47:47 +0000
4
@@ -20,7 +20,7 @@
5
20
#include <transfer/dm-source.h>
20
#include <transfer/dm-source.h>
6
21
21
7
22
#include <click.h>
22
#include <click.h>
9
23
#include <ubuntu-app-launch.h>
23
#include <ubuntu-app-launch/registry.h>
10
24
24
11
25
#include <glib/gstdio.h>
25
#include <glib/gstdio.h>
12
26
#include <json-glib/json-glib.h>
26
#include <json-glib/json-glib.h>
13
@@ -28,6 +28,9 @@
14
28
28
15
29
#include <algorithm>
29
#include <algorithm>
16
30
#include <iostream>
30
#include <iostream>
17
31
#include <memory>
18
32
19
33
namespace ual = ubuntu::app_launch;
20
31
34
21
32
namespace unity {
35
namespace unity {
22
33
namespace indicator {
36
namespace indicator {
23
@@ -55,7 +58,8 @@
24
55
             const std::string& ccad_path):
58
             const std::string& ccad_path):
25
56
    m_bus(G_DBUS_CONNECTION(g_object_ref(connection))),
59
    m_bus(G_DBUS_CONNECTION(g_object_ref(connection))),
26
57
    m_cancellable(g_cancellable_new()),
60
    m_cancellable(g_cancellable_new()),
28
58
    m_ccad_path(ccad_path)
61
    m_ccad_path(ccad_path),
29
62
    m_registry(new ual::Registry())
30
59
  {
63
  {
31
60
    id = next_unique_id();
64
    id = next_unique_id();
32
61
    time_started = time(nullptr);
65
    time_started = time(nullptr);
33
@@ -108,22 +112,21 @@
34
108
  void open_app()
112
  void open_app()
35
109
  {
113
  {
36
110
    // destination app has priority over app_id
114
    // destination app has priority over app_id
38
111
    std::string app_id = download_app_id();
115
    auto app_id = ual::AppID::parse(download_app_id());
39
112
116
40
113
    if (app_id.empty() && !m_package_name.empty()) {
117
    if (app_id.empty() && !m_package_name.empty()) {
44
114
        app_id = std::string(ubuntu_app_launch_triplet_to_app_id(m_package_name.c_str(),
118
        app_id = ual::AppID::find(m_package_name);
42
115
                                                                 "first-listed-app",
43
116
                                                                 "current-user-version"));
45
117
    }
119
    }
46
118
120
47
119
    if (app_id.empty())
121
    if (app_id.empty())
48
120
      {
122
      {
50
121
        g_warning("Fail to discovery app-id");
123
        g_warning("Failed to discover APP_ID");
51
122
      }
124
      }
52
123
    else
125
    else
53
124
      {
126
      {
56
125
        g_debug("calling ubuntu_app_launch_start_application() for %s", app_id.c_str());
127
        g_debug("Launching '%s'", std::string(app_id).c_str());
57
126
        ubuntu_app_launch_start_application(app_id.c_str(), nullptr);
128
        auto app = ual::Application::create(app_id, m_registry);
58
129
        app->launch();
59
127
      }
130
      }
60
128
  }
131
  }
61
129
132
62
@@ -582,68 +585,20 @@
63
582
585
64
583
  void update_app_info_from_package_name(const std::string &package_name)
586
  void update_app_info_from_package_name(const std::string &package_name)
65
584
  {
587
  {
73
585
    std::string app_id = std::string(ubuntu_app_launch_triplet_to_app_id(package_name.c_str(),
588
    auto app_id = ual::AppID::find(package_name);
74
586
                                                                         "first-listed-app",
589
    update_app_info_from_app_id(app_id);
68
587
                                                                         "current-user-version"));
69
588
    if (!app_id.empty())
70
589
      update_app_info_from_app_id(app_id);
71
590
    else
72
591
      g_warning("fail to retrive app-id from package: %s", package_name.c_str());
75
592
  }
590
  }
76
593
591
77
594
  void update_app_info_from_app_id(const std::string &app_id)
592
  void update_app_info_from_app_id(const std::string &app_id)
78
595
  {
593
  {
130
596
    gchar *app_dir;
594
    try {
131
597
    gchar *app_desktop_file;
595
      auto app = ual::Application::create(ual::AppID::parse(app_id), m_registry);
132
598
596
      auto info = app->info();
133
599
    if (!ubuntu_app_launch_application_info(app_id.c_str(), &app_dir, &app_desktop_file))
597
      std::string iconPath{info->iconPath()};
134
600
      {
598
      set_icon(iconPath.c_str());
135
601
        g_warning("Fail to get app info: %s", app_id.c_str());
599
    } catch (const std::exception& e) {
136
602
        return;
600
      g_warning("Unable to get icon for '%s': %s", app_id.c_str(), e.what());
137
603
      }
601
    }
87
604
88
605
    g_debug("App data: %s : %s", app_dir, app_desktop_file);
89
606
    gchar *full_app_desktop_file = g_build_filename(app_dir, app_desktop_file, nullptr);
90
607
    GKeyFile *app_info = g_key_file_new();
91
608
    GError *error = nullptr;
92
609
93
610
    g_debug("Open desktop file: %s", full_app_desktop_file);
94
611
    g_key_file_load_from_file(app_info, full_app_desktop_file, G_KEY_FILE_NONE, &error);
95
612
    if (error)
96
613
      {
97
614
        g_warning("Fail to open desktop info: %s:%s", full_app_desktop_file, error->message);
98
615
        g_free(full_app_desktop_file);
99
616
        g_key_file_free(app_info);
100
617
        g_error_free(error);
101
618
      }
102
619
    else
103
620
      {
104
621
        gchar *icon_name = g_key_file_get_string(app_info, "Desktop Entry", "Icon", &error);
105
622
        if (error == nullptr)
106
623
          {
107
624
108
625
            gchar *full_icon_name = g_build_filename(app_dir, icon_name, nullptr);
109
626
            g_debug("App icon: %s", icon_name);
110
627
            g_debug("App full icon name: %s", full_icon_name);
111
628
            // check if it is full path icon or a themed one
112
629
            if (g_file_test(full_icon_name, G_FILE_TEST_EXISTS))
113
630
              set_icon(full_icon_name);
114
631
            else
115
632
              set_icon(icon_name);
116
633
            g_free(full_icon_name);
117
634
          }
118
635
        else
119
636
          {
120
637
            g_warning("Fail to retrive icon:", error->message);
121
638
            g_error_free(error);
122
639
          }
123
640
        g_free(icon_name);
124
641
      }
125
642
126
643
    g_key_file_free(app_info);
127
644
    g_free(full_app_desktop_file);
128
645
    g_free(app_dir);
129
646
    g_free(app_desktop_file);
138
647
  }
602
  }
139
648
603
140
649
  /***
604
  /***
141
@@ -691,6 +646,7 @@
142
691
  std::string m_destination_app;
646
  std::string m_destination_app;
143
692
  std::string m_package_name;
647
  std::string m_package_name;
144
693
  const std::string m_ccad_path;
648
  const std::string m_ccad_path;
145
649
  std::shared_ptr<ual::Registry> m_registry;
146
694
};
650
};
147
695
651
148
696
} // anonymous namespace
652
} // anonymous namespace
Reviewer	Review Type	Date Requested	Status
Pete Woods (community)		2016-12-02	Approve on 2016-12-05
unity-api-1-bot	continuous-integration		Approve on 2016-12-02
Review via email: mp+312375@code.launchpad.net
1	=== modified file 'src/dm-plugin/dm-source.cpp'
2	--- src/dm-plugin/dm-source.cpp 2015-12-16 19:32:40 +0000
3	+++ src/dm-plugin/dm-source.cpp 2016-12-02 16:47:47 +0000
4	@@ -20,7 +20,7 @@
5	20	#include <transfer/dm-source.h>	20	#include <transfer/dm-source.h>
6	21		21
7	22	#include <click.h>	22	#include <click.h>
9	23	#include <ubuntu-app-launch.h>	23	#include <ubuntu-app-launch/registry.h>
10	24		24
11	25	#include <glib/gstdio.h>	25	#include <glib/gstdio.h>
12	26	#include <json-glib/json-glib.h>	26	#include <json-glib/json-glib.h>
13	@@ -28,6 +28,9 @@
14	28		28
15	29	#include <algorithm>	29	#include <algorithm>
16	30	#include <iostream>	30	#include <iostream>
17			31	#include <memory>
18			32
19			33	namespace ual = ubuntu::app_launch;
20	31		34
21	32	namespace unity {	35	namespace unity {
22	33	namespace indicator {	36	namespace indicator {
23	@@ -55,7 +58,8 @@
24	55	const std::string& ccad_path):	58	const std::string& ccad_path):
25	56	m_bus(G_DBUS_CONNECTION(g_object_ref(connection))),	59	m_bus(G_DBUS_CONNECTION(g_object_ref(connection))),
26	57	m_cancellable(g_cancellable_new()),	60	m_cancellable(g_cancellable_new()),
28	58	m_ccad_path(ccad_path)	61	m_ccad_path(ccad_path),
29			62	m_registry(new ual::Registry())
30	59	{	63	{
31	60	id = next_unique_id();	64	id = next_unique_id();
32	61	time_started = time(nullptr);	65	time_started = time(nullptr);
33	@@ -108,22 +112,21 @@
34	108	void open_app()	112	void open_app()
35	109	{	113	{
36	110	// destination app has priority over app_id	114	// destination app has priority over app_id
38	111	std::string app_id = download_app_id();	115	auto app_id = ual::AppID::parse(download_app_id());
39	112		116
40	113	if (app_id.empty() && !m_package_name.empty()) {	117	if (app_id.empty() && !m_package_name.empty()) {
44	114	app_id = std::string(ubuntu_app_launch_triplet_to_app_id(m_package_name.c_str(),	118	app_id = ual::AppID::find(m_package_name);
42	115	"first-listed-app",
43	116	"current-user-version"));
45	117	}	119	}
46	118		120
47	119	if (app_id.empty())	121	if (app_id.empty())
48	120	{	122	{
50	121	g_warning("Fail to discovery app-id");	123	g_warning("Failed to discover APP_ID");
51	122	}	124	}
52	123	else	125	else
53	124	{	126	{
56	125	g_debug("calling ubuntu_app_launch_start_application() for %s", app_id.c_str());	127	g_debug("Launching '%s'", std::string(app_id).c_str());
57	126	ubuntu_app_launch_start_application(app_id.c_str(), nullptr);	128	auto app = ual::Application::create(app_id, m_registry);
58			129	app->launch();
59	127	}	130	}
60	128	}	131	}
61	129		132
62	@@ -582,68 +585,20 @@
63	582		585
64	583	void update_app_info_from_package_name(const std::string &package_name)	586	void update_app_info_from_package_name(const std::string &package_name)
65	584	{	587	{
73	585	std::string app_id = std::string(ubuntu_app_launch_triplet_to_app_id(package_name.c_str(),	588	auto app_id = ual::AppID::find(package_name);
74	586	"first-listed-app",	589	update_app_info_from_app_id(app_id);
68	587	"current-user-version"));
69	588	if (!app_id.empty())
70	589	update_app_info_from_app_id(app_id);
71	590	else
72	591	g_warning("fail to retrive app-id from package: %s", package_name.c_str());
75	592	}	590	}
76	593		591
77	594	void update_app_info_from_app_id(const std::string &app_id)	592	void update_app_info_from_app_id(const std::string &app_id)
78	595	{	593	{
130	596	gchar *app_dir;	594	try {
131	597	gchar *app_desktop_file;	595	auto app = ual::Application::create(ual::AppID::parse(app_id), m_registry);
132	598		596	auto info = app->info();
133	599	if (!ubuntu_app_launch_application_info(app_id.c_str(), &app_dir, &app_desktop_file))	597	std::string iconPath{info->iconPath()};
134	600	{	598	set_icon(iconPath.c_str());
135	601	g_warning("Fail to get app info: %s", app_id.c_str());	599	} catch (const std::exception& e) {
136	602	return;	600	g_warning("Unable to get icon for '%s': %s", app_id.c_str(), e.what());
137	603	}	601	}
87	604
88	605	g_debug("App data: %s : %s", app_dir, app_desktop_file);
89	606	gchar *full_app_desktop_file = g_build_filename(app_dir, app_desktop_file, nullptr);
90	607	GKeyFile *app_info = g_key_file_new();
91	608	GError *error = nullptr;
92	609
93	610	g_debug("Open desktop file: %s", full_app_desktop_file);
94	611	g_key_file_load_from_file(app_info, full_app_desktop_file, G_KEY_FILE_NONE, &error);
95	612	if (error)
96	613	{
97	614	g_warning("Fail to open desktop info: %s:%s", full_app_desktop_file, error->message);
98	615	g_free(full_app_desktop_file);
99	616	g_key_file_free(app_info);
100	617	g_error_free(error);
101	618	}
102	619	else
103	620	{
104	621	gchar *icon_name = g_key_file_get_string(app_info, "Desktop Entry", "Icon", &error);
105	622	if (error == nullptr)
106	623	{
107	624
108	625	gchar *full_icon_name = g_build_filename(app_dir, icon_name, nullptr);
109	626	g_debug("App icon: %s", icon_name);
110	627	g_debug("App full icon name: %s", full_icon_name);
111	628	// check if it is full path icon or a themed one
112	629	if (g_file_test(full_icon_name, G_FILE_TEST_EXISTS))
113	630	set_icon(full_icon_name);
114	631	else
115	632	set_icon(icon_name);
116	633	g_free(full_icon_name);
117	634	}
118	635	else
119	636	{
120	637	g_warning("Fail to retrive icon:", error->message);
121	638	g_error_free(error);
122	639	}
123	640	g_free(icon_name);
124	641	}
125	642
126	643	g_key_file_free(app_info);
127	644	g_free(full_app_desktop_file);
128	645	g_free(app_dir);
129	646	g_free(app_desktop_file);
138	647	}	602	}
139	648		603
140	649	/***	604	/***
141	@@ -691,6 +646,7 @@
142	691	std::string m_destination_app;	646	std::string m_destination_app;
143	692	std::string m_package_name;	647	std::string m_package_name;
144	693	const std::string m_ccad_path;	648	const std::string m_ccad_path;
145			649	std::shared_ptr<ual::Registry> m_registry;
146	694	};	650	};
147	695		651
148	696	} // anonymous namespace	652	} // anonymous namespace