diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | icons/Makefile.am | 1 | ||||
| -rw-r--r-- | icons/nautilus-server-connect.png | bin | 0 -> 4151 bytes | |||
| -rw-r--r-- | src/Makefile.am | 12 | ||||
| -rw-r--r-- | src/nautilus-server-connect.c | 503 | ||||
| -rw-r--r-- | src/nautilus-server-connect.desktop.in | 9 | ||||
| -rw-r--r-- | src/nautilus-server-connect.glade | 110 |
7 files changed, 643 insertions, 2 deletions
@@ -1,3 +1,13 @@ +2002-10-31 Bastien Nocera <hadess@hadess.net> + + * icons/Makefile.am: upd + * icons/nautilus-server-connect.png: added + * src/Makefile.am: upd + * src/nautilus-server-connect.c: added + * src/nautilus-server-connect.desktop.in: added + * src/nautilus-server-connect.glade: added (This all still needs some + work) + 2002-10-31 Anders Carlsson <andersca@gnu.org> * configure.in: Require gtk+ 2.1.1 diff --git a/icons/Makefile.am b/icons/Makefile.am index b0721384f..974fd00ca 100644 --- a/icons/Makefile.am +++ b/icons/Makefile.am @@ -24,6 +24,7 @@ icon_DATA =\ knob.png \ nautilus-launch-icon.png \ nautilus-mini-logo.png \ + nautilus-server-connect.png \ note-indicator.png \ number_strip.png \ side_bar_image.png \ diff --git a/icons/nautilus-server-connect.png b/icons/nautilus-server-connect.png Binary files differnew file mode 100644 index 000000000..cb504eb82 --- /dev/null +++ b/icons/nautilus-server-connect.png diff --git a/src/Makefile.am b/src/Makefile.am index 2229e2351..1f73c7b9b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.shared SUBDIRS=file-manager -bin_PROGRAMS=nautilus +bin_PROGRAMS=nautilus nautilus-server-connect INCLUDES =\ -I$(top_srcdir) \ @@ -33,6 +33,13 @@ LDADD =\ $(CORE_LIBS) \ $(NULL) +@INTLTOOL_DESKTOP_RULE@ + +nautilus_server_connect_SOURCES = nautilus-server-connect.c + +DESKTOP_IN_FILES=nautilus-server-connect.desktop.in +DESKTOP_FILES=$(DESKTOP_IN_FILES:.desktop.in=.desktop) + nautilus_shell_interface_idl_sources = \ nautilus-shell-interface-stubs.c \ nautilus-shell-interface-skels.c \ @@ -133,7 +140,7 @@ ui_DATA = \ $(NULL) gladedir = $(datadir)/nautilus/glade -glade_DATA = nautilus-bookmarks-window.glade +glade_DATA = nautilus-bookmarks-window.glade nautilus-server-connect.glade CLEANFILES = \ $(nautilus_shell_interface_idl_sources) \ @@ -147,6 +154,7 @@ EXTRA_DIST = \ $(ui_DATA) \ check-nautilus \ nautilus-shell-interface.idl \ + $(DESKTOP_IN_FILES) $(DESKTOP_FILES) \ $(NULL) BUILT_SOURCES = \ diff --git a/src/nautilus-server-connect.c b/src/nautilus-server-connect.c new file mode 100644 index 000000000..9e996195f --- /dev/null +++ b/src/nautilus-server-connect.c @@ -0,0 +1,503 @@ +/* Copyright (C) 2002 Bastien Nocera <hadess@hadess.net> + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + */ + +#include <config.h> +#include <stdio.h> +#include <string.h> +#include <gnome.h> +#include <gconf/gconf-client.h> +#include <glade/glade.h> +#include <libgnomevfs/gnome-vfs.h> +#include <libgnome/gnome-desktop-item.h> + +#undef DEBUG +#ifdef DEBUG +#define D(x...) g_message (x) +#else +#define D(x...) +#endif + +#define NETWORK_USER_DIR "/.gnome2/vfolders/network/" + +static GladeXML *xml = NULL; +static GtkWidget *toplevel = NULL; +static GtkWidget *entry = NULL; +static GtkWidget *image = NULL; +static const char *icon_name = NULL; +static const char *naut_icon = NULL; + +static void +error (char *msg) +{ + GtkWidget *dialog; + + dialog = gtk_message_dialog_new (NULL, + 0, + GTK_MESSAGE_ERROR, + GTK_BUTTONS_CLOSE, + msg, + NULL); + gtk_dialog_run (GTK_DIALOG (dialog)); +} + +static GnomeVFSResult +gnome_vfs_make_directory_with_parents_for_uri (GnomeVFSURI * uri, + guint perm) +{ + GnomeVFSResult result; + GnomeVFSURI *parent, *work_uri; + GList *list = NULL; + + result = gnome_vfs_make_directory_for_uri (uri, perm); + if (result == GNOME_VFS_OK || result != GNOME_VFS_ERROR_NOT_FOUND) + return result; + + work_uri = uri; + + while (result == GNOME_VFS_ERROR_NOT_FOUND) { + parent = gnome_vfs_uri_get_parent (work_uri); + D("trying to create: %s", gnome_vfs_uri_to_string (parent, 0)); + result = gnome_vfs_make_directory_for_uri (parent, perm); + + if (result == GNOME_VFS_ERROR_NOT_FOUND) + list = g_list_prepend (list, parent); + work_uri = parent; + } + + if (result != GNOME_VFS_OK) { + /* Clean up */ + while (list != NULL) { + gnome_vfs_uri_unref ((GnomeVFSURI *) list->data); + list = g_list_remove (list, list->data); + } + } + + while (result == GNOME_VFS_OK && list != NULL) { + D("creating: %s", gnome_vfs_uri_to_string (list->data, 0)); + result = gnome_vfs_make_directory_for_uri + ((GnomeVFSURI *) list->data, perm); + + gnome_vfs_uri_unref ((GnomeVFSURI *) list->data); + list = g_list_remove (list, list->data); + } + + result = gnome_vfs_make_directory_for_uri (uri, perm); + return result; +} + +static GnomeVFSResult +gnome_vfs_make_directory_with_parents (const gchar * text_uri, guint perm) +{ + GnomeVFSURI *uri; + GnomeVFSResult result; + + D("gnome_vfs_make_directory_with_parents (%s)", text_uri); + uri = gnome_vfs_uri_new (text_uri); + result = gnome_vfs_make_directory_with_parents_for_uri (uri, perm); + D ("gnome_vfs_make_directory_with_parents: %s\n", + gnome_vfs_result_to_string (result)); + gnome_vfs_uri_unref (uri); + + return result; +} + +static void +browse (char *uri) +{ + char *argv[3] = {"nautilus", uri, NULL}; + + D ("browse (%s)", uri); + if (gnome_execute_async (g_get_home_dir (), 2, argv) < 0) + { + error (_("Couldn't execute nautilus\nMake sure nautilus is in your path and correctly installed")); + } +} + +static gboolean +already_linked (char *uri) +{ + GDir *dir; + char *path; + const char *files; + gboolean found = FALSE; + + path = g_strconcat (g_get_home_dir (), NETWORK_USER_DIR, NULL); + dir = g_dir_open (path, 0, NULL); + + D ("already_linked: opened %s", path); + + if (dir == NULL) + { + g_free (path); + return FALSE; + } + + files = g_dir_read_name (dir); + /* No files in the directory ? */ + if (files == NULL) + { + g_dir_close (dir); + g_free (path); + return FALSE; + } + + for (files = g_dir_read_name (dir); files != NULL && found != TRUE; + files = g_dir_read_name (dir)) + { + GnomeDesktopItem *di; + char *long_path; + const char *target; + + long_path = g_strconcat (path, files, NULL); + D ("already_linked: opening desktop %s", long_path); + + di = gnome_desktop_item_new_from_file (long_path, + GNOME_DESKTOP_ITEM_LOAD_ONLY_IF_EXISTS, + NULL); + if (gnome_desktop_item_get_entry_type (di) != + GNOME_DESKTOP_ITEM_TYPE_LINK) + { + D ("already_linked: %s not a link", long_path); + g_free (long_path); + gnome_desktop_item_unref (di); + continue; + } + + target = gnome_desktop_item_get_string (di, + GNOME_DESKTOP_ITEM_URL); + if (strncmp (target, uri, MIN (strlen (target), strlen (uri))) == 0) + { + D ("%s (%d) and %s (%d) matched (on %d chars)", + target, strlen (target), + uri, strlen (uri), + MIN (strlen (target), strlen (uri))); + found = TRUE; + } + + g_free (long_path); + gnome_desktop_item_unref (di); + } + + g_dir_close (dir); + g_free (path); + D ("already_linked: returning %s", found ? "TRUE" : "FALSE"); + return found; +} + +static gboolean +create_desktop (char *uri) +{ + char *path, *prefix; + int i; + gboolean created = FALSE; + + if (already_linked (uri) == TRUE) + return created; + + prefix = g_strdup (g_path_get_basename (uri)); + D ("create_desktop: basename prefix %s", prefix); + if (prefix == NULL) + { + D ("create_desktop: dirname prefix %s", prefix); + prefix = g_path_get_dirname (uri); + } + + if (prefix == NULL) + return created; + + i = -1; + while (created == FALSE) + { + GnomeDesktopItem *di; + + /* i == 0 on the first time it's called */ + i++; + + path = g_strdup_printf ("%s%s%s.%d.desktop", + g_get_home_dir (), NETWORK_USER_DIR, + prefix, i); + D ("create_desktop: trying %s", path); + if (g_file_test (path, G_FILE_TEST_EXISTS) == TRUE) + { + D ("create_desktop: %s exists", path); + g_free (path); + continue; + } + + di = gnome_desktop_item_new (); + if (di == NULL) + { + D ("create_desktop: couldn't create an di"); + g_free (path); + continue; + } + + gnome_desktop_item_set_string (di, GNOME_DESKTOP_ITEM_VERSION, + "1.0"); + gnome_desktop_item_set_string (di, GNOME_DESKTOP_ITEM_ENCODING, + "UTF-8"); + gnome_desktop_item_set_string (di, GNOME_DESKTOP_ITEM_NAME, + prefix); + gnome_desktop_item_set_string (di, GNOME_DESKTOP_ITEM_URL, uri); + gnome_desktop_item_set_string (di, GNOME_DESKTOP_ITEM_TYPE, + "Link"); + gnome_desktop_item_set_string (di, GNOME_DESKTOP_ITEM_ICON, + icon_name); + gnome_desktop_item_set_string (di, "X-Nautilus-Icon", + naut_icon); + + created = gnome_desktop_item_save (di, path, TRUE, NULL); +#ifdef DEBUG + if (created == TRUE) + g_message ("create_desktop: created %s", path); + else + g_message ("create_desktop: couldn't create %s", path); +#endif + g_free (path); + } + + g_free (prefix); + + return created; +} + +static gboolean +can_connect (const char *uri) +{ + GnomeVFSDirectoryHandle *handle; + GnomeVFSResult result; + + D ("can_connect (%s)", uri); + + result = gnome_vfs_directory_open (&handle, uri, + GNOME_VFS_FILE_INFO_DEFAULT); + D ("can_connect: %s (%d)", gnome_vfs_result_to_string (result), + result); + + if (result == GNOME_VFS_OK) + { + gnome_vfs_directory_close (handle); + return TRUE; + } + + return FALSE; +} + +static void +update_icon (GtkEntry *entry, gpointer user_data) +{ + GtkWidget *button; + char *uri_utf8, *uri, *filename; + + uri_utf8 = gtk_editable_get_chars (GTK_EDITABLE (entry), 0, -1); + if (uri_utf8 == NULL) + uri = NULL; + else + uri = g_filename_from_utf8 (uri_utf8, -1, NULL, NULL, NULL); + g_free (uri_utf8); + + button = glade_xml_get_widget (xml, "button3"); + + if (uri == NULL || strcmp (uri, "") == 0) + { + gtk_widget_set_sensitive (button, FALSE); + icon_name = "document-icons/i-network.png"; + naut_icon = "i-network"; + } else { + gtk_widget_set_sensitive (button, TRUE); + if ((strncmp (uri, "smb:", strlen("smb:")) == 0) + || (g_strrstr (uri, ":") == NULL)) { + icon_name = "document-icons/i-smb.png"; + naut_icon = "i-smb"; + } else if (strncmp (uri, "ftp:", strlen("ftp:")) == 0) { + icon_name = "document-icons/i-ftp.png"; + naut_icon = "i-ftp"; + } else if (strncmp (uri, "http:", strlen("http:")) == 0) { + icon_name = "document-icons/i-web.png"; + naut_icon = "i-web"; + } else { + icon_name = "document-icons/i-network.png"; + naut_icon = "i-network"; + } + } + + filename = gnome_program_locate_file (NULL, + GNOME_FILE_DOMAIN_PIXMAP, + icon_name, TRUE, NULL); + gtk_image_set_from_file (GTK_IMAGE (image), filename); + g_free (filename); + g_free (uri); +} + +static void +button_clicked (GtkWidget *widget, int response, gpointer data) +{ + char *uri_utf8, *uri; + + gtk_widget_hide (toplevel); + while (gtk_events_pending()) + gtk_main_iteration(); + + D ("button_clicked: %d", response); + + if (response == GTK_RESPONSE_CANCEL + || response == GTK_RESPONSE_DELETE_EVENT) + exit (0); + + uri_utf8 = gtk_editable_get_chars (GTK_EDITABLE (entry), 0, -1); + uri = g_filename_from_utf8 (uri_utf8, -1, NULL, NULL, NULL); + g_free (uri_utf8); + + D ("uri: %s", uri); + + if (uri == NULL || strcmp (uri, "") == 0) + exit (0); + + /* non-uri-like addresses are considered either workgroups + * or computers on an smb network */ + if (g_strrstr (uri, ":") == NULL) + { + char *new_uri; + + new_uri = g_strdup_printf ("smb://%s", uri); + g_free (uri); + uri = new_uri; + } + + /* We create the .desktop file even if we can't connect to the URI */ + create_desktop (uri); + + if (can_connect(uri) == FALSE) + { + char *msg; + + D ("couldn't connect to %s", uri); + + msg = g_strdup_printf (_("Couldn't connect to URI %s\n" + "Please make sure that the address is " + "correct and alternatively, type in " + "this address in the file manager " + "directly"), uri); + error (msg); + g_free (msg); + } else { + browse(uri); + } + + exit (0); +} + +static void +create_user_network_dir (void) +{ + char *path; + + gnome_vfs_init (); + path = g_strconcat ("file://", g_get_home_dir (), + NETWORK_USER_DIR, NULL); + gnome_vfs_make_directory_with_parents (path, + GNOME_VFS_PERM_USER_ALL + | GNOME_VFS_PERM_GROUP_ALL + | GNOME_VFS_PERM_OTHER_READ); + g_free (path); +} + +int +main (int argc, char *argv[]) +{ + GnomeClient *client; + gchar *window_icon; + + setlocale (LC_ALL, ""); + bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR); + bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); + textdomain (GETTEXT_PACKAGE); + + gnome_program_init ("nautilus-server-connect", VERSION, + LIBGNOMEUI_MODULE, + argc, argv, + GNOME_PROGRAM_STANDARD_PROPERTIES, + NULL); + + glade_gnome_init(); + client = gnome_master_client (); + gnome_client_set_restart_style (client, GNOME_RESTART_NEVER); + + if (g_file_test ("nautilus-server-connect.glade", + G_FILE_TEST_EXISTS) == TRUE) { + xml = glade_xml_new ("nautilus-server-connect.glade", NULL, NULL); + } + if (xml == NULL) { + xml = glade_xml_new (GLADEDIR "/nautilus-server-connect.glade", + NULL, NULL); + } + if (xml == NULL) { + GtkWidget *dialog; + dialog = gtk_message_dialog_new + (NULL /* parent */, + 0 /* flags */, + GTK_MESSAGE_ERROR, + GTK_BUTTONS_OK, + _("Glade file for the connect to server program is" + " missing.\nPlease check your installation of " + "nautilus")); + gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_destroy (dialog); + exit (1); + } + + create_user_network_dir (); + + toplevel = glade_xml_get_widget (xml, "dialog1"); + image = glade_xml_get_widget (xml, "image1"); + entry = glade_xml_get_widget (xml, "entry"); + update_icon (GTK_ENTRY (entry), NULL); + + window_icon = gnome_program_locate_file (NULL, + GNOME_FILE_DOMAIN_PIXMAP, + "nautilus-server-connect.png", FALSE, NULL); + g_message ("window_icon: %s", window_icon); + if (window_icon) { + gnome_window_icon_set_from_file (GTK_WINDOW (toplevel), + window_icon); + g_free (window_icon); + } + + gtk_widget_grab_focus (entry); + gtk_editable_select_region (GTK_EDITABLE (entry), 0, -1); + g_signal_connect (G_OBJECT (entry), "activate", + G_CALLBACK (button_clicked), + NULL); + g_signal_connect (G_OBJECT (toplevel), "response", + G_CALLBACK (button_clicked), + NULL); + g_signal_connect (G_OBJECT (toplevel), "close", + G_CALLBACK (exit), + 0); + g_signal_connect (G_OBJECT (entry), "changed", + G_CALLBACK (update_icon), + NULL); + gtk_dialog_set_default_response (GTK_DIALOG (toplevel), + GTK_RESPONSE_OK); + + gtk_widget_show_now (toplevel); + + gtk_main (); + + return 0; +} diff --git a/src/nautilus-server-connect.desktop.in b/src/nautilus-server-connect.desktop.in new file mode 100644 index 000000000..598ce49f4 --- /dev/null +++ b/src/nautilus-server-connect.desktop.in @@ -0,0 +1,9 @@ +[Desktop Entry] +Encoding=UTF-8 +_Name=New Server +_Comment=Add a new server to your Network Servers and connect to it +TryExec=nautilus-server-connect +Exec=nautilus-server-connect +Icon=nautilus-server-connect.png +Terminal=0 +Type=Application diff --git a/src/nautilus-server-connect.glade b/src/nautilus-server-connect.glade new file mode 100644 index 000000000..ceb402c64 --- /dev/null +++ b/src/nautilus-server-connect.glade @@ -0,0 +1,110 @@ +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*--> +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd"> + +<glade-interface> + +<widget class="GtkDialog" id="dialog1"> + <property name="title" translatable="yes">New Server</property> + <property name="type">GTK_WINDOW_TOPLEVEL</property> + <property name="window_position">GTK_WIN_POS_CENTER</property> + <property name="modal">False</property> + <property name="resizable">False</property> + <property name="destroy_with_parent">False</property> + <property name="has_separator">True</property> + + <child internal-child="vbox"> + <widget class="GtkVBox" id="dialog-vbox2"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">0</property> + + <child internal-child="action_area"> + <widget class="GtkHButtonBox" id="dialog-action_area2"> + <property name="visible">True</property> + <property name="layout_style">GTK_BUTTONBOX_END</property> + + <child> + <widget class="GtkButton" id="button2"> + <property name="visible">True</property> + <property name="can_default">True</property> + <property name="can_focus">True</property> + <property name="label">gtk-cancel</property> + <property name="use_stock">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="response_id">-6</property> + </widget> + </child> + + <child> + <widget class="GtkButton" id="button3"> + <property name="visible">True</property> + <property name="can_default">True</property> + <property name="can_focus">True</property> + <property name="label">gtk-ok</property> + <property name="use_stock">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="response_id">-5</property> + </widget> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack_type">GTK_PACK_END</property> + </packing> + </child> + + <child> + <widget class="GtkHBox" id="hbox1"> + <property name="border_width">4</property> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">0</property> + + <child> + <widget class="GtkImage" id="image1"> + <property name="visible">True</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkEntry" id="entry"> + <property name="width_request">250</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="editable">True</property> + <property name="visibility">True</property> + <property name="max_length">0</property> + <property name="text" translatable="yes"></property> + <property name="has_frame">True</property> + <property name="invisible_char" translatable="yes">*</property> + <property name="activates_default">False</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + </child> +</widget> + +</glade-interface> |
