1
=== modified file 'liblibertine/libertine.cpp'
2
--- liblibertine/libertine.cpp	2016-05-06 20:06:43 +0000
3
+++ liblibertine/libertine.cpp	2016-08-03 17:21:14 +0000
4
@@ -21,17 +21,19 @@
5
21
#include "libertine/ContainerConfigList.h"
21
#include "libertine/ContainerConfigList.h"
6
22
#include "libertine/LibertineConfig.h"
22
#include "libertine/LibertineConfig.h"
7
23
23
8
24
9
24
namespace
25
namespace
10
25
{
26
{
11
26
constexpr auto DESKTOP_EXTENSION   = ".desktop";
27
constexpr auto DESKTOP_EXTENSION   = ".desktop";
12
27
constexpr auto GLOBAL_APPLICATIONS = "usr/share/applications";
28
constexpr auto GLOBAL_APPLICATIONS = "usr/share/applications";
13
28
constexpr auto LOCAL_APPLICATIONS  = ".local/share/applications";
29
constexpr auto LOCAL_APPLICATIONS  = ".local/share/applications";
14
29
30
15
31
16
30
GError*
32
GError*
17
31
list_apps_from_path(gchar* path, const gchar* container_id, GArray* apps)
33
list_apps_from_path(gchar* path, const gchar* container_id, GArray* apps)
18
32
{
34
{
19
33
  GError* error = nullptr;
35
  GError* error = nullptr;
21
34
  GDir * dir = g_dir_open(path, 0, &error);
36
  GDir* dir = g_dir_open(path, 0, &error);
22
35
  if (error != nullptr)
37
  if (error != nullptr)
23
36
  {
38
  {
24
37
    return error;
39
    return error;
25
@@ -50,6 +52,14 @@
26
50
      g_array_append_val(apps, app_id);
52
      g_array_append_val(apps, app_id);
27
51
      g_free(name);
53
      g_free(name);
28
52
    }
54
    }
29
55
    else if (g_file_test(file, G_FILE_TEST_IS_DIR))
30
56
    {
31
57
      error = list_apps_from_path(file, container_id, apps);
32
58
      if (error != nullptr)
33
59
      {
34
60
        return error;
35
61
      }
36
62
    }
37
53
    g_free(file);
63
    g_free(file);
38
54
  }
64
  }
39
55
65
40
@@ -58,6 +68,7 @@
41
58
}
68
}
42
59
}
69
}
43
60
70
44
71
45
61
gchar**
72
gchar**
46
62
libertine_list_apps_for_container(const gchar* container_id)
73
libertine_list_apps_for_container(const gchar* container_id)
47
63
{
74
{
48
@@ -92,6 +103,7 @@
49
92
  return (gchar**)g_array_free(apps, FALSE);
103
  return (gchar**)g_array_free(apps, FALSE);
50
93
}
104
}
51
94
105
52
106
53
95
gchar **
107
gchar **
54
96
libertine_list_containers(void)
108
libertine_list_containers(void)
55
97
{
109
{
56
@@ -106,7 +118,7 @@
57
106
118
58
107
  for (i = 0; i < container_count; ++i)
119
  for (i = 0; i < container_count; ++i)
59
108
  {
120
  {
61
109
    id = container_list.data(container_list.index(i, 0), (int)ContainerConfigList::DataRole::ContainerId); 
121
    id = container_list.data(container_list.index(i, 0), (int)ContainerConfigList::DataRole::ContainerId);
62
110
    gchar * container_id = g_strdup((gchar *)id.toString().toStdString().c_str());
122
    gchar * container_id = g_strdup((gchar *)id.toString().toStdString().c_str());
63
111
    g_array_append_val(containers, container_id);
123
    g_array_append_val(containers, container_id);
64
112
  }
124
  }
65
113
125
66
=== modified file 'liblibertine/libertine.h'
67
--- liblibertine/libertine.h	2015-09-21 19:13:40 +0000
68
+++ liblibertine/libertine.h	2016-08-03 17:21:14 +0000
69
@@ -24,7 +24,7 @@
70
24
24
71
25
/**
25
/**
72
26
 * libertine_list_containers:
26
 * libertine_list_containers:
74
27
 * 
27
 *
75
28
 * Gets the list of existing containers for the user.
28
 * Gets the list of existing containers for the user.
76
29
 *
29
 *
77
30
 * Return value: (transfer full): A NULL terminated list of
30
 * Return value: (transfer full): A NULL terminated list of
78
@@ -68,7 +68,7 @@
79
68
/**
68
/**
80
69
 * libertine_list_apps_for_container:
69
 * libertine_list_apps_for_container:
81
70
 * @container_id: ID of the container
70
 * @container_id: ID of the container
83
71
 * 
71
 *
84
72
 * Gets the list of existing apps installed in a container.
72
 * Gets the list of existing apps installed in a container.
85
73
 *
73
 *
86
74
 * Return value: (transfer full): A NULL terminated list of
74
 * Return value: (transfer full): A NULL terminated list of
Reviewer	Review Type	Date Requested	Status
Christopher Townsend		2016-08-01	Approve on 2016-08-05
Libertine CI Bot	continuous-integration		Approve on 2016-08-03
Review via email: mp+301694@code.launchpad.net