KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'use_loop' of https://github.com/Luflosi/kitty

Browse Source
This commit is contained in:
Kovid Goyal 2020-04-28 19:40:40 +05:30
commit 53ae2bbe0d
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
kitty/desktop.c
View File

@ -30,18 +30,22 @@ static void* libsn_handle = NULL;
static PyObject* static PyObject*
init_x11_startup_notification(PyObject UNUSED *self, PyObject *args) { init_x11_startup_notification(PyObject UNUSED *self, PyObject *args) {
static bool done = false; static bool done = false;
static const char* libname = "libstartup-notification-1.so";
// some installs are missing the .so symlink, so try the full name
static const char* libname2 = "libstartup-notification-1.so.0";
static const char* libname3 = "libstartup-notification-1.so.0.0.0";
if (!done) { if (!done) {
done = true; done = true;
libsn_handle = dlopen(libname, RTLD_LAZY); const char* libnames[] = {
if (libsn_handle == NULL) libsn_handle = dlopen(libname2, RTLD_LAZY); "libstartup-notification-1.so",
if (libsn_handle == NULL) libsn_handle = dlopen(libname3, RTLD_LAZY); // some installs are missing the .so symlink, so try the full name
"libstartup-notification-1.so.0",
"libstartup-notification-1.so.0.0.0",
NULL
};
for (int i = 0; libnames[i]; i++) {
libsn_handle = dlopen(libnames[i], RTLD_LAZY);
if (libsn_handle) break;
}
if (libsn_handle == NULL) { if (libsn_handle == NULL) {
PyErr_Format(PyExc_OSError, "Failed to load %s with error: %s", libname, dlerror()); PyErr_Format(PyExc_OSError, "Failed to load %s with error: %s", libnames[0], dlerror());
return NULL; return NULL;
} }
dlerror(); /* Clear any existing error */ dlerror(); /* Clear any existing error */
@ -105,18 +109,22 @@ load_libcanberra_functions(void) {
static void static void
load_libcanberra(void) { load_libcanberra(void) {
static const char* libname = "libcanberra.so";
// some installs are missing the .so symlink, so try the full name
static const char* libname2 = "libcanberra.so.0";
static const char* libname3 = "libcanberra.so.0.2.5";
static bool done = false; static bool done = false;
if (done) return; if (done) return;
done = true; done = true;
libcanberra_handle = dlopen(libname, RTLD_LAZY); const char* libnames[] = {
if (libcanberra_handle == NULL) libcanberra_handle = dlopen(libname2, RTLD_LAZY); "libcanberra.so",
if (libcanberra_handle == NULL) libcanberra_handle = dlopen(libname3, RTLD_LAZY); // some installs are missing the .so symlink, so try the full name
"libcanberra.so.0",
"libcanberra.so.0.2.5",
NULL
};
for (int i = 0; libnames[i]; i++) {
libcanberra_handle = dlopen(libnames[i], RTLD_LAZY);
if (libcanberra_handle) break;
}
if (libcanberra_handle == NULL) { if (libcanberra_handle == NULL) {
fprintf(stderr, "Failed to load %s, cannot play beep sound, with error: %s\n", libname, dlerror()); fprintf(stderr, "Failed to load %s, cannot play beep sound, with error: %s\n", libnames[0], dlerror());
return; return;
} }
load_libcanberra_functions(); load_libcanberra_functions();