FOSS/xfce4-taskmanager
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve app search on close (bug 14466)

Browse Source
This commit is contained in:
rim
2018-06-21 12:10:15 +03:00
committed by Landry Breuil
parent 68ad15a06b
commit af078d406a
1 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/app-manager.c
View File

@@ -44,6 +44,7 @@ static gint app_pid_compare_fn (gconstpointer a, gconstpointer b);
static void apps_add_application (GArray *apps, WnckApplication *application, GPid pid); static void apps_add_application (GArray *apps, WnckApplication *application, GPid pid);
static void apps_remove_application (GArray *apps, WnckApplication *application); static void apps_remove_application (GArray *apps, WnckApplication *application);
static App * apps_lookup_pid (GArray *apps, GPid pid); static App * apps_lookup_pid (GArray *apps, GPid pid);
static App * apps_lookup_app (GArray *apps, WnckApplication *application);
static void application_opened (WnckScreen *screen, WnckApplication *application, XtmAppManager *manager); static void application_opened (WnckScreen *screen, WnckApplication *application, XtmAppManager *manager);
static void application_closed (WnckScreen *screen, WnckApplication *application, XtmAppManager *manager); static void application_closed (WnckScreen *screen, WnckApplication *application, XtmAppManager *manager);
@@ -97,12 +98,17 @@ static GPid
app_get_pid(WnckApplication *application) app_get_pid(WnckApplication *application)
{ {
GPid pid; GPid pid;
GList *windows;
if (NULL == application) if (NULL == application)
return (0); return (0);
pid = wnck_application_get_pid (application); pid = wnck_application_get_pid (application);
if (pid != 0) if (pid != 0)
return (pid); return (pid);
return (wnck_window_get_pid (WNCK_WINDOW (wnck_application_get_windows (application)->data))); windows = wnck_application_get_windows (application);
if (NULL != windows && NULL != windows->data)
return (wnck_window_get_pid (WNCK_WINDOW (windows->data)));
return (0);
} }
static gint static gint
@@ -134,6 +140,8 @@ apps_remove_application (GArray *apps, WnckApplication *application)
{ {
App *app = apps_lookup_pid(apps, app_get_pid (application)); App *app = apps_lookup_pid(apps, app_get_pid (application));
if (app == NULL)
app = apps_lookup_app(apps, application);
if (app == NULL) if (app == NULL)
return; return;
g_object_unref (app->icon); g_object_unref (app->icon);
@@ -150,6 +158,21 @@ apps_lookup_pid (GArray *apps, GPid pid)
return (bsearch(&tapp, apps->data, apps->len, sizeof(App), app_pid_compare_fn)); return (bsearch(&tapp, apps->data, apps->len, sizeof(App), app_pid_compare_fn));
} }
static App *
apps_lookup_app (GArray *apps, WnckApplication *application)
{
App *tapp;
guint i;
for (i = 0; i < apps->len; i++) {
tapp = &g_array_index (apps, App, i);
if (tapp->application == application)
return (tapp);
}
return (NULL);
}
static void static void
application_opened (WnckScreen *screen __unused, WnckApplication *application, XtmAppManager *manager) application_opened (WnckScreen *screen __unused, WnckApplication *application, XtmAppManager *manager)
{ {