Rename icons to follow fd.o icon naming spec. Move icons to the right

[empathy.git] / src / empathy.c

diff --git a/src/empathy.c b/src/empathy.c
index e1a32a0b6d8e05ae41ed756c90d9f5b3b5126ac8..5786cb7ae7d7dfee1833740a89df93b4edfc01a3 100644 (file)
--- a/src/empathy.c
+++ b/src/empathy.c
@@ -28,9 +28,8 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
-#include <libgnome/gnome-program.h>
-#include <libgnomeui/gnome-ui-init.h>
 #include <libebook/e-book.h>
+#include <libgnomevfs/gnome-vfs.h>
 
 #include <libtelepathy/tp-conn.h>
 #include <libtelepathy/tp-chan.h>
@@ -265,7 +264,6 @@ main (int argc, char *argv[])
        McAccountMonitor  *monitor;
        EmpathyIdle       *idle;
        EmpathyChandler   *chandler;
-       GnomeProgram      *program;
        gboolean           no_connect = FALSE;
        GOptionContext    *context;
        GOptionEntry       options[] = {
@@ -287,18 +285,11 @@ main (int argc, char *argv[])
 
        g_set_application_name (PACKAGE_NAME);
 
-       program = gnome_program_init ("empathy",
-                                     PACKAGE_VERSION,
-                                     LIBGNOMEUI_MODULE,
-                                     argc, argv,
-                                     GNOME_PROGRAM_STANDARD_PROPERTIES,
-                                     "goption-context", context,
-                                     GNOME_PARAM_HUMAN_READABLE_NAME, PACKAGE_NAME,
-                                     NULL);
-
+       gtk_init (&argc, &argv);
        gtk_window_set_default_icon_name ("empathy");
        gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (),
-                                          DATADIR G_DIR_SEPARATOR_S "empathy");
+                                          PKGDATADIR G_DIR_SEPARATOR_S "icons");
+       gnome_vfs_init ();
 
        /* Setting up MC */
        monitor = mc_account_monitor_new ();
@@ -339,7 +330,6 @@ main (int argc, char *argv[])
        g_object_unref (mc);
        g_object_unref (idle);
        g_object_unref (icon);
-       g_object_unref (program);
 
        return EXIT_SUCCESS;
 }