callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

include "gdk/gdk.h" instead of "gdk/gdkscreen.h"

Browse Source 
2008-05-26  Michael Natterer  <mitch@imendio.com>

	* gtk/gtkshow.h: include "gdk/gdk.h" instead of "gdk/gdkscreen.h"

	* gtk/gtkshow.c: remove inclusion of single files from gdk/

	Removed trailing whitespace in both files.


svn path=/trunk/; revision=20176
This commit is contained in:
Michael Natterer
2008-05-26 09:51:48 +00:00
committed by Michael Natterer
parent 6fb474f223
commit 27dbd9a425
3 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2008-05-26 Michael Natterer <mitch@imendio.com>
* gtk/gtkshow.h: include "gdk/gdk.h" instead of "gdk/gdkscreen.h"
* gtk/gtkshow.c: remove inclusion of single files from gdk/
Removed trailing whitespace in both files.
2008-05-26 Richard Hult <richard@imendio.com> 2008-05-26 Richard Hult <richard@imendio.com>
Bug 530353 – Mac-like gtk_accelerator_get_label() Bug 530353 – Mac-like gtk_accelerator_get_label()

22
gtk/gtkshow.c
View File

@ -1,4 +1,4 @@
/* /*
* GTK - The GIMP Toolkit * GTK - The GIMP Toolkit
* Copyright (C) 2008 Jaap Haitsma <jaap@haitsma.org> * Copyright (C) 2008 Jaap Haitsma <jaap@haitsma.org>
* *
@ -24,8 +24,6 @@
#include <glib.h> #include <glib.h>
#include <gio/gio.h> #include <gio/gio.h>
#include "gdk/gdkscreen.h"
#include "gdk/gdkapplaunchcontext.h"
#include "gtkshow.h" #include "gtkshow.h"
@ -36,22 +34,22 @@
* gtk_show_uri: * gtk_show_uri:
* @screen: screen to show the uri on or %NULL for the default screen * @screen: screen to show the uri on or %NULL for the default screen
* @uri: the uri to show * @uri: the uri to show
* @timestamp: a timestamp to prevent focus stealing. * @timestamp: a timestamp to prevent focus stealing.
* @error: a #GError that is returned in case of errors * @error: a #GError that is returned in case of errors
* *
* This is a convenience function for launching the default application * This is a convenience function for launching the default application
* to show the uri. The uri must be of a form understood by GIO. Typical * to show the uri. The uri must be of a form understood by GIO. Typical
* examples are * examples are
* <simplelist> * <simplelist>
* <member><filename>file:///home/gnome/pict.jpg</filename></member> * <member><filename>file:///home/gnome/pict.jpg</filename></member>
* <member><filename>http://www.gnome.org</filename></member> * <member><filename>http://www.gnome.org</filename></member>
* <member><filename>mailto:me&commat;gnome.org</filename></member> * <member><filename>mailto:me&commat;gnome.org</filename></member>
* </simplelist> * </simplelist>
* Ideally the timestamp is taken from the event triggering * Ideally the timestamp is taken from the event triggering
* the gtk_show_uri() call. If timestamp is not known you can take * the gtk_show_uri() call. If timestamp is not known you can take
* %GDK_CURRENT_TIME. * %GDK_CURRENT_TIME.
* *
* This function can be used as a replacement for gnome_vfs_url_show() * This function can be used as a replacement for gnome_vfs_url_show()
* and gnome_url_show(). * and gnome_url_show().
* *
* Returns: %TRUE on success, %FALSE on error. * Returns: %TRUE on success, %FALSE on error.
@ -59,9 +57,9 @@
* Since: 2.14 * Since: 2.14
*/ */
gboolean gboolean
gtk_show_uri (GdkScreen *screen, gtk_show_uri (GdkScreen *screen,
const gchar *uri, const gchar *uri,
guint32 timestamp, guint32 timestamp,
GError **error) GError **error)
{ {
GdkAppLaunchContext *context; GdkAppLaunchContext *context;

14
gtk/gtkshow.h
View File

@ -1,4 +1,4 @@
/* /*
* GTK - The GIMP Toolkit * GTK - The GIMP Toolkit
* Copyright (C) 2008 Jaap Haitsma <jaap@haitsma.org> * Copyright (C) 2008 Jaap Haitsma <jaap@haitsma.org>
* *
@ -19,22 +19,20 @@
* Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA. * Boston, MA 02111-1307, USA.
*/ */
#ifndef __GTK_SHOW_H__ #ifndef __GTK_SHOW_H__
#define __GTK_SHOW_H__ #define __GTK_SHOW_H__
#include <glib.h> #include <glib.h>
#include "gdk/gdkscreen.h" #include "gdk/gdk.h"
G_BEGIN_DECLS G_BEGIN_DECLS
gboolean gtk_show_uri (GdkScreen *screen, gboolean gtk_show_uri (GdkScreen *screen,
const gchar *uri, const gchar *uri,
guint32 timestamp, guint32 timestamp,
GError **error); GError **error);
G_END_DECLS G_END_DECLS
#endif /* __GTK_SHOW_H__ */ #endif /* __GTK_SHOW_H__ */