← Back to branch summary

~didrocks/notify-osd/bootstrap

« back to all changes in this revision

Viewing changes to src/defaults.c

  • Committer: Mirco Müller
  • Date: 2011-07-08 08:34:52 UTC
  • Revision ID: mirco.mueller@ubuntu.com-20110708083452-63omzhch22lgpjqs
multiple fixes for compiler-warnings/errors, more porting work

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/defaults.c
439
439
                                     &items_left,
440
440
                                     (guchar **) (void*) &coords);
441
441
        gdk_flush ();
442
 
        gdk_error_trap_pop ();
 
442
        gdk_error_trap_pop_ignored ();
443
443
 
444
444
        if (result == Success && items_read)
445
445
        {
2365
2365
        gdk_error_trap_push ();
2366
2366
 
2367
2367
        result = XGetClassHint (gdk_x11_display_get_xdisplay (gdk_display_get_default ()),
2368
 
                                GDK_WINDOW_XWINDOW (win),
 
2368
                                GDK_WINDOW_XID (win),
2369
2369
                                &class_hints);
2370
2370
 
2371
2371
        if (! result || class_hints.res_class == NULL)
2375
2375
                goto failed;
2376
2376
 
2377
2377
        /* discard dialog windows like panel properties or the applet directory... */
2378
 
        if (wnck_window_get_window_type (wnck_window_get (GDK_WINDOW_XWINDOW (win)))
 
2378
        if (wnck_window_get_window_type (wnck_window_get (GDK_WINDOW_XID (win)))
2379
2379
            != WNCK_WINDOW_DOCK)
2380
2380
                goto failed;
2381
2381
 
2395
2395
        if (class_hints.res_name)
2396
2396
                XFree (class_hints.res_name);
2397
2397
 
2398
 
        gdk_error_trap_pop ();
 
2398
        gdk_error_trap_pop_ignored ();
2399
2399
 
2400
2400
        return is_panel;
2401
2401
}