jcarr
/
libnotify
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: Bump dependency on glib 2.38 

It's almost 10 years old, so I think we can safely depend on that to
support the features we're optionally depending on, plus the ones we're
going to add
This commit is contained in:
Marco Trevisan (Treviño) 2022-05-11 18:46:41 +02:00
parent 543d636153
commit c6534a144c
6 changed files with 1 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libnotify/notification.c
View File

@ -707,9 +707,7 @@ notify_notification_show (NotifyNotification *notification,
GHashTableIter iter; GHashTableIter iter;
gpointer key, data; gpointer key, data;
GVariant *result; GVariant *result;
#ifdef GLIB_VERSION_2_32
GApplication *application = NULL; GApplication *application = NULL;
#endif
g_return_val_if_fail (notification != NULL, FALSE); g_return_val_if_fail (notification != NULL, FALSE);
g_return_val_if_fail (NOTIFY_IS_NOTIFICATION (notification), FALSE); g_return_val_if_fail (NOTIFY_IS_NOTIFICATION (notification), FALSE);
@ -763,7 +761,6 @@ notify_notification_show (NotifyNotification *notification,
g_variant_new_take_string (snap_desktop)); g_variant_new_take_string (snap_desktop));
} }
#ifdef GLIB_VERSION_2_32
if (!_notify_get_snap_app ()) { if (!_notify_get_snap_app ()) {
application = g_application_get_default (); application = g_application_get_default ();
} }
@ -779,7 +776,6 @@ notify_notification_show (NotifyNotification *notification,
g_variant_new_string (application_id)); g_variant_new_string (application_id));
} }
} }
#endif
/* TODO: make this nonblocking */ /* TODO: make this nonblocking */
result = g_dbus_proxy_call_sync (proxy, result = g_dbus_proxy_call_sync (proxy,

8
libnotify/notify.c
View File

@ -166,28 +166,20 @@ notify_init (const char *app_name)
return TRUE; return TRUE;
if (app_name == NULL) { if (app_name == NULL) {
#ifdef GLIB_VERSION_2_32
GApplication *application; GApplication *application;
#endif
app_name = _notify_get_snap_app (); app_name = _notify_get_snap_app ();
#ifdef GLIB_VERSION_2_32
if (app_name == NULL && if (app_name == NULL &&
(application = g_application_get_default ())) { (application = g_application_get_default ())) {
app_name = g_application_get_application_id (application); app_name = g_application_get_application_id (application);
} }
#endif
} }
if (!set_app_name (app_name)) { if (!set_app_name (app_name)) {
return FALSE; return FALSE;
} }
#ifndef GLIB_VERSION_2_36
g_type_init ();
#endif
_initted = TRUE; _initted = TRUE;
return TRUE; return TRUE;

2
meson.build
View File

@ -36,7 +36,7 @@ man1dir = join_paths(prefix, get_option('mandir'), 'man1')
libnotify_deps = [] libnotify_deps = []
extra_deps = [] extra_deps = []
glib_req_version = '>= 2.26.0' glib_req_version = '>= 2.38.0'
gdk_pixbuf_dep = dependency('gdk-pixbuf-2.0') gdk_pixbuf_dep = dependency('gdk-pixbuf-2.0')
glib_dep = dependency('glib-2.0', version: glib_req_version) glib_dep = dependency('glib-2.0', version: glib_req_version)

4
tests/test-error.c
View File

@ -29,10 +29,6 @@ main ()
{ {
NotifyNotification *n; NotifyNotification *n;
#ifndef GLIB_VERSION_2_36
g_type_init ();
#endif
notify_init ("Error Handling"); notify_init ("Error Handling");
n = notify_notification_new ("Summary", "Content", NULL); n = notify_notification_new ("Summary", "Content", NULL);

4
tests/test-replace.c
View File

@ -28,10 +28,6 @@ main ()
GError *error; GError *error;
error = NULL; error = NULL;
#ifndef GLIB_VERSION_2_36
g_type_init ();
#endif
notify_init ("Replace Test"); notify_init ("Replace Test");
n = notify_notification_new ("Summary", n = notify_notification_new ("Summary",

4
tools/notify-send.c
View File

@ -283,10 +283,6 @@ main (int argc, char *argv[])
setlocale (LC_ALL, ""); setlocale (LC_ALL, "");
#ifndef GLIB_VERSION_2_36
g_type_init ();
#endif
g_set_prgname (argv[0]); g_set_prgname (argv[0]);
g_log_set_always_fatal (G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL); g_log_set_always_fatal (G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL);