Mercurial > pidgin
comparison pidgin/gtkidle.c @ 32690:650d40e86c10
GDK_DISPLAY has been deprecated, and its replacement has been around
for a long time.
author | Elliott Sales de Andrade <qulogic@pidgin.im> |
---|---|
date | Sun, 09 Oct 2011 04:55:33 +0000 |
parents | 80affba7ea0d |
children |
comparison
equal
deleted
inserted
replaced
32689:737733593a29 | 32690:650d40e86c10 |
---|---|
105 static XScreenSaverInfo *mit_info = NULL; | 105 static XScreenSaverInfo *mit_info = NULL; |
106 static int has_extension = -1; | 106 static int has_extension = -1; |
107 int event_base, error_base; | 107 int event_base, error_base; |
108 | 108 |
109 if (has_extension == -1) | 109 if (has_extension == -1) |
110 has_extension = XScreenSaverQueryExtension(GDK_DISPLAY(), &event_base, &error_base); | 110 has_extension = XScreenSaverQueryExtension(GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), |
111 &event_base, &error_base); | |
111 | 112 |
112 if (has_extension) | 113 if (has_extension) |
113 { | 114 { |
114 if (mit_info == NULL) | 115 if (mit_info == NULL) |
115 mit_info = XScreenSaverAllocInfo(); | 116 mit_info = XScreenSaverAllocInfo(); |
116 | 117 |
117 XScreenSaverQueryInfo(GDK_DISPLAY(), GDK_ROOT_WINDOW(), mit_info); | 118 XScreenSaverQueryInfo(GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), |
119 GDK_ROOT_WINDOW(), mit_info); | |
118 return (mit_info->idle) / 1000; | 120 return (mit_info->idle) / 1000; |
119 } | 121 } |
120 else | 122 else |
121 return 0; | 123 return 0; |
122 # endif /* !_WIN32 */ | 124 # endif /* !_WIN32 */ |