Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make systemd optional #746

Merged
merged 5 commits into from
Mar 11, 2024
Merged

Make systemd optional #746

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
86a190c
Make systemd optional
oz123 Mar 3, 2024
0f0f4f7
Disable function definitions if systemd isn't found
oz123 Mar 4, 2024
162c69c
Enable systemd by default
oz123 Mar 6, 2024
1989c37
Add libsystemd to build.yml
oz123 Mar 6, 2024
fd1f550
Fix summary output
oz123 Mar 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 22 additions & 5 deletions capplets/system-info/mate-system-info.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
*
*/
#include <gtk/gtk.h>
#include <glib.h>
#include <glibtop/fsusage.h>
#include <glibtop/mountlist.h>
#include <glibtop/mem.h>
Expand Down Expand Up @@ -131,13 +132,15 @@ static void
mate_system_info_set_row (MateSystemInfo *info)
{
mate_system_info_row_fill (info->hostname_row, _("Device Name"), FALSE);
# ifdef HAVE_SYSTEMD
mate_system_info_row_fill (info->hardware_model_row, _("Hardware Model"), TRUE);
mate_system_info_row_fill (info->virtualization_row, _("Virtualization"), TRUE);
# endif
mate_system_info_row_fill (info->memory_row, _("Memory"), TRUE);
mate_system_info_row_fill (info->processor_row, _("Processor"), TRUE);
mate_system_info_row_fill (info->graphics_row, _("Graphics"), TRUE);
mate_system_info_row_fill (info->disk_row, _("Disk Capacity"), FALSE);
mate_system_info_row_fill (info->kernel_row, _("Kernel Version"), FALSE);
mate_system_info_row_fill (info->virtualization_row, _("Virtualization"), TRUE);
mate_system_info_row_fill (info->windowing_system_row, _("Windowing System"), TRUE);
mate_system_info_row_fill (info->mate_version_row, _("MATE Version"), TRUE);
mate_system_info_row_fill (info->os_name_row, _("OS Name"), TRUE);
Expand All @@ -159,6 +162,7 @@ mate_system_info_set_row (MateSystemInfo *info)
static char *
get_system_hostname (void)
{
# ifdef HAVE_SYSTEMD
GDBusProxy *hostnamed_proxy;
g_autoptr(GVariant) variant = NULL;
g_autoptr(GError) error = NULL;
Expand Down Expand Up @@ -206,8 +210,12 @@ get_system_hostname (void)
g_object_unref (hostnamed_proxy);
return g_variant_dup_string (variant, NULL);
}
# else
return g_strdup (g_get_host_name ());
# endif
}

# ifdef HAVE_SYSTEMD
static char *
get_hardware_model (void)
{
Expand Down Expand Up @@ -258,6 +266,7 @@ get_hardware_model (void)

return NULL;
}
# endif

static char *
get_cpu_info (void)
Expand Down Expand Up @@ -478,6 +487,7 @@ get_kernel_vesrion (void)
return g_strdup_printf ("%s %s", un.sysname, un.release);
}

# ifdef HAVE_SYSTEMD
static struct {
const char *id;
const char *display;
Expand Down Expand Up @@ -560,6 +570,7 @@ get_system_virt (void)

return get_virtualization_label (g_variant_get_string (inner, NULL));
}
# endif

oz123 marked this conversation as resolved.
Show resolved Hide resolved
static char *
get_mate_desktop_version ()
Expand Down Expand Up @@ -615,15 +626,17 @@ mate_system_info_setup (MateSystemInfo *info)
{
g_autofree char *logo_name = NULL;
g_autofree char *hostname_text = NULL;
# ifdef HAVE_SYSTEMD
g_autofree char *hw_model_text = NULL;
g_autofree char *virt_text = NULL;
# endif
g_autofree char *memory_text = NULL;
g_autofree char *cpu_text = NULL;
g_autofree char *os_type_text = NULL;
g_autofree char *os_name_text = NULL;
g_autofree char *disk_text = NULL;
g_autofree char *kernel_text = NULL;
g_autofree char *windowing_system_text = NULL;
g_autofree char *virt_text = NULL;
g_autofree char *de_text = NULL;
g_autofree char *graphics_hardware_string = NULL;

Expand All @@ -638,14 +651,15 @@ mate_system_info_setup (MateSystemInfo *info)
label = g_object_get_data (G_OBJECT (info->hostname_row), "labelvalue");
set_lable_style (label, "gray", 12, hostname_text, FALSE);

oz123 marked this conversation as resolved.
Show resolved Hide resolved
# if HAVE_SYSTEMD
hw_model_text = get_hardware_model ();
if (hw_model_text != NULL)
{
gtk_widget_show_all (info->hardware_model_row);
label = g_object_get_data (G_OBJECT (info->hardware_model_row), "labelvalue");
set_lable_style (label, "gray", 12, hw_model_text, FALSE);
}

# endif
glibtop_get_mem (&mem);
memory_text = g_format_size_full (mem.total, G_FORMAT_SIZE_IEC_UNITS);
label = g_object_get_data (G_OBJECT (info->memory_row), "labelvalue");
Expand All @@ -666,14 +680,15 @@ mate_system_info_setup (MateSystemInfo *info)
kernel_text = get_kernel_vesrion ();
label = g_object_get_data (G_OBJECT (info->kernel_row), "labelvalue");
set_lable_style (label, "gray", 12, kernel_text, FALSE);

# ifdef HAVE_SYSTEMD
virt_text = get_system_virt ();
if (virt_text != NULL)
{
gtk_widget_show_all (info->virtualization_row);
label = g_object_get_data (G_OBJECT (info->virtualization_row), "labelvalue");
set_lable_style (label, "gray", 12, virt_text, FALSE);
}
# endif
windowing_system_text = get_windowing_system ();
label = g_object_get_data (G_OBJECT (info->windowing_system_row), "labelvalue");
set_lable_style (label, "gray", 12, windowing_system_text, FALSE);
Expand Down Expand Up @@ -706,7 +721,10 @@ mate_system_info_class_init (MateSystemInfoClass *klass)
gtk_widget_class_set_template_from_resource (widget_class, "/org/mate/control-center/system-info/mate-system-info.ui");

gtk_widget_class_bind_template_child (widget_class, MateSystemInfo, hostname_row);
# ifdef HAVE_SYSTEMD
gtk_widget_class_bind_template_child (widget_class, MateSystemInfo, hardware_box);
gtk_widget_class_bind_template_child (widget_class, MateSystemInfo, virtualization_row);
# endif
gtk_widget_class_bind_template_child (widget_class, MateSystemInfo, disk_row);
gtk_widget_class_bind_template_child (widget_class, MateSystemInfo, mate_version_row);
gtk_widget_class_bind_template_child (widget_class, MateSystemInfo, graphics_row);
Expand All @@ -717,7 +735,6 @@ mate_system_info_class_init (MateSystemInfoClass *klass)
gtk_widget_class_bind_template_child (widget_class, MateSystemInfo, os_name_row);
gtk_widget_class_bind_template_child (widget_class, MateSystemInfo, os_type_row);
gtk_widget_class_bind_template_child (widget_class, MateSystemInfo, processor_row);
gtk_widget_class_bind_template_child (widget_class, MateSystemInfo, virtualization_row);
gtk_widget_class_bind_template_child (widget_class, MateSystemInfo, kernel_row);
gtk_widget_class_bind_template_child (widget_class, MateSystemInfo, windowing_system_row);
}
Expand Down
16 changes: 15 additions & 1 deletion configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,6 @@ PKG_CHECK_MODULES(TYPING, $GMODULE_ADD glib-2.0 >= $GLIB_REQUIRED gio-2.0 gtk+-3
PKG_CHECK_MODULES(GIO, gio-2.0)
PKG_CHECK_MODULES(GLIBTOP, libgtop-2.0)
PKG_CHECK_MODULES(UDISKS, udisks2)
PKG_CHECK_MODULES(SYSTEMD, systemd >= $SYSTEMD_REQUIRED)

PKG_CHECK_MODULES([DCONF], [dconf >= 0.13.4])
AC_SUBST(DCONF_CFLAGS)
Expand Down Expand Up @@ -168,6 +167,20 @@ AC_ARG_ENABLE([libappindicator],
[enable_appindicator=yes],
[enable_appindicator=no])])])

AC_ARG_ENABLE([systemd],
[AS_HELP_STRING([--enable-systemd[=@<:@no/auto/yes@:>@]],[Use systemd @<:@default=yes@:>@])],
[enable_systemd=$enableval],
[PKG_CHECK_EXISTS([$SYSTEMD >= $SYSTEMD_REQUIRED],
[enable_systemd=no],
,
)])

AS_IF([test "x$enable_systemd" = xyes],
[AC_MSG_NOTICE([Building with systemd support.])
PKG_CHECK_MODULES([SYSTEMD],
[systemd >= $SYSTEMD_REQUIRED],
[AC_DEFINE(HAVE_SYSTEMD, 1, [Have systemd])])])

AS_IF([test "x$enable_appindicator" = xyes],
[AC_MSG_NOTICE([Buidling against Ubuntu AppIndicator.])
PKG_CHECK_MODULES([APPINDICATOR],
Expand Down Expand Up @@ -313,6 +326,7 @@ Configure summary:

Ayatana AppIndicator (preferred) $(test "x$enable_appindicator" = xyes && echo no || echo yes)
Ubuntu AppIndicator (legacy) $(test "x$enable_appindicator" = xyes && echo yes || echo no)
Systemd: $(test "x$enable_systemd" = xyes && echo yes || echo no)

Accountsservice: ${have_accountsservice}
Native Language support: ${USE_NLS}
Expand Down