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

notify: Support passing a NULL application name to notify_init() 

We can find its name in some scenarios, so make it clearer from in the API.

Also, ensure that notify_set_app_name() is not used with a NULL App
name.
This commit is contained in:
Marco Trevisan (Treviño) 2022-05-17 03:39:06 +02:00
parent e8ea0c39d0
commit cc30d8b8dd
1 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
libnotify/notify.c
View File

@ -121,6 +121,18 @@ _notify_update_spec_version (GError **error)
return TRUE; return TRUE;
} }
static gboolean
set_app_name (const char *app_name)
{
g_return_val_if_fail (app_name != NULL, FALSE);
g_return_val_if_fail (*app_name != '\0', FALSE);
g_free (_app_name);
_app_name = g_strdup (app_name);
return TRUE;
}
/** /**
* notify_set_app_name: * notify_set_app_name:
@ -132,24 +144,24 @@ _notify_update_spec_version (GError **error)
void void
notify_set_app_name (const char *app_name) notify_set_app_name (const char *app_name)
{ {
g_free (_app_name); set_app_name (app_name);
_app_name = g_strdup (app_name);
} }
/** /**
* notify_init: * notify_init:
* @app_name: The name of the application initializing libnotify. * @app_name: (nullable): The name of the application initializing libnotify.
* *
* Initialized libnotify. This must be called before any other functions. * Initialized libnotify. This must be called before any other functions.
* *
* Starting from 0.8, if the provided @app_name is %NULL, libnotify will
* try to figure it out from the running application.
* Before it was not allowed, and was causing libnotify not to be initialized.
*
* Returns: %TRUE if successful, or %FALSE on error. * Returns: %TRUE if successful, or %FALSE on error.
*/ */
gboolean gboolean
notify_init (const char *app_name) notify_init (const char *app_name)
{ {
g_return_val_if_fail (app_name != NULL, FALSE);
g_return_val_if_fail (*app_name != '\0', FALSE);
if (_initted) if (_initted)
return TRUE; return TRUE;
@ -168,7 +180,9 @@ notify_init (const char *app_name)
#endif #endif
} }
notify_set_app_name (app_name); if (!set_app_name (app_name)) {
return FALSE;
}
#ifndef GLIB_VERSION_2_36 #ifndef GLIB_VERSION_2_36
g_type_init (); g_type_init ();