← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/gnome-panel/oneiric

« back to all changes in this revision

Viewing changes to gnome-panel/libegg/eggsmclient-xsmp.c

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2011-05-30 11:04:49 UTC
  • mfrom: (1.3.4 upstream)
  • mto: This revision was merged to the branch mainline in revision 204.
  • Revision ID: james.westby@ubuntu.com-20110530110449-ut1tc5t61rpvf9e3
Tags: upstream-3.0.2
Import upstream version 3.0.2

Show diffs side-by-side

added added

removed removed

Lines of Context:
gnome-panel/libegg/eggsmclient-xsmp.c
36
36
#include <X11/SM/SMlib.h>
37
37
 
38
38
#include <gdk/gdk.h>
 
39
#include <gdk/gdkx.h>
39
40
 
40
41
#define EGG_TYPE_SM_CLIENT_XSMP            (egg_sm_client_xsmp_get_type ())
41
42
#define EGG_SM_CLIENT_XSMP(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), EGG_TYPE_SM_CLIENT_XSMP, EggSMClientXSMP))
367
368
      free (ret_client_id);
368
369
 
369
370
      gdk_threads_enter ();
 
371
#if !GTK_CHECK_VERSION(2,91,7) && !GTK_CHECK_VERSION(3,0,0)
370
372
      gdk_set_sm_client_id (xsmp->client_id);
 
373
#else
 
374
      gdk_x11_set_sm_client_id (xsmp->client_id);
 
375
#endif
371
376
      gdk_threads_leave ();
372
377
 
373
378
      g_debug ("Got client ID \"%s\"", xsmp->client_id);