AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-09-20 14:00:10 +00:00
Code Issues Projects Releases Wiki Activity

Use g_get_host_name().

Browse Source 
2005-07-08  Tor Lillqvist  <tml@novell.com>

	* gtk/gtkfilesel.c: Use g_get_host_name().
This commit is contained in:
Tor Lillqvist 2005-07-08 14:35:31 +00:00 committed by Tor Lillqvist
parent 2f4440ef50
commit cacfdbc2ae
4 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2005-07-08 Tor Lillqvist <tml@novell.com>
* gtk/gtkfilesel.c: Use g_get_host_name().
2005-07-07 Matthias Clasen <mclasen@redhat.com>
* configure.in: Add -DHPPEX -DSHMLINK to CFLAGS for HP-UX.

4
ChangeLog.pre-2-10
View File

@ -1,3 +1,7 @@
2005-07-08 Tor Lillqvist <tml@novell.com>
* gtk/gtkfilesel.c: Use g_get_host_name().
2005-07-07 Matthias Clasen <mclasen@redhat.com>
* configure.in: Add -DHPPEX -DSHMLINK to CFLAGS for HP-UX.

4
ChangeLog.pre-2-8
View File

@ -1,3 +1,7 @@
2005-07-08 Tor Lillqvist <tml@novell.com>
* gtk/gtkfilesel.c: Use g_get_host_name().
2005-07-07 Matthias Clasen <mclasen@redhat.com>
* configure.in: Add -DHPPEX -DSHMLINK to CFLAGS for HP-UX.

18
gtk/gtkfilesel.c
View File

@ -51,9 +51,6 @@
#include <windows.h>
#undef STRICT
#endif /* G_PLATFORM_WIN32 */
#ifdef G_OS_WIN32
#include <winsock.h> /* For gethostname */
#endif
#include "gdk/gdkkeysyms.h"
#include "gtkbutton.h"
@ -940,8 +937,7 @@ filenames_dropped (GtkWidget *widget,
char *uri = NULL;
char *filename = NULL;
char *hostname;
char this_hostname[257];
int res;
const char *this_hostname;
GError *error = NULL;
if (!selection_data->data)
@ -963,11 +959,10 @@ filenames_dropped (GtkWidget *widget,
return;
}
res = gethostname (this_hostname, 256);
this_hostname[256] = 0;
this_hostname = g_get_host_name ();
if ((hostname == NULL) ||
(res == 0 && strcmp (hostname, this_hostname) == 0) ||
(strcmp (hostname, this_hostname) == 0) ||
(strcmp (hostname, "localhost") == 0))
gtk_file_selection_set_filename (GTK_FILE_SELECTION (widget),
filename);
@ -1023,8 +1018,7 @@ filenames_drag_get (GtkWidget *widget,
{
const gchar *file;
gchar *uri_list;
char hostname[256];
int res;
const char *hostname;
GError *error;
file = gtk_file_selection_get_filename (filesel);
@ -1033,10 +1027,10 @@ filenames_drag_get (GtkWidget *widget,
{
if (info == TARGET_URILIST)
{
res = gethostname (hostname, 256);
hostname = g_get_host_name ();
error = NULL;
uri_list = g_filename_to_uri (file, (!res)?hostname:NULL, &error);
uri_list = g_filename_to_uri (file, hostname, &error);
if (!uri_list)
{
g_warning ("Error getting filename: %s\n",