pidgin3: comparison pidgin/gtkmain.c

-:1d0da9270ff9
+:c7f80fead80f
 #ifdef HAVE_SIGNAL_H
 static void sighandler(int sig);
 /**
-* Reap all our dead children.  Sometimes Purple forks off a separate
+* Reap all our dead children.  Sometimes libpurple forks off a separate
 * process to do some stuff.  When that process exits we are
 * informed about it so that we can call waitpid() and let it
 * stop being a zombie.
 *
 * We used to do this immediately when our signal handler was
 *
 * Anyway, so then GStreamer waits for its child to die and then
 * it continues with the initialization process.  This means that
 * we have a race condition where GStreamer is waitpid()ing for its
 * child to die and we're catching the SIGCHLD signal.  If GStreamer
-* is awarded the zombied process then everything is ok.  But if Purple
+* is awarded the zombied process then everything is ok.  But if libpurple
 * reaps the zombie process then the GStreamer initialization sequence
 * fails.
 *
 * So the ugly solution is to wait a second to give GStreamer time to
 * reap that bad boy.
 #ifndef _WIN32
 	GList *icons = NULL;
 	GdkPixbuf *icon = NULL;
 	char *icon_path;
 	int i;
-	const char *icon_sizes[] = {
+	struct {
-		"16",
+		const char *dir;
-		"24",
+		const char *filename;
-		"32",
+	} icon_sizes[] = {
-		"48"
+		{"16x16", "pidgin.png"},
+		{"24x24", "pidgin.png"},
+		{"32x32", "pidgin.png"},
+		{"48x48", "pidgin.png"},
+		{"scalable", "pidgin.svg"}
 	};
 #endif
 	pidgin_themes_init();
 	pidgin_blist_setup_sort_methods();
 #ifndef _WIN32
 	/* use the nice PNG icon for all the windows */
 	for(i=0; i<G_N_ELEMENTS(icon_sizes); i++) {
-		icon_path = g_build_filename(DATADIR, "pixmaps", "pidgin", "icons", icon_sizes[i], "pidgin.png", NULL);
+		icon_path = g_build_filename(DATADIR, "icons", "hicolor", icon_sizes[i].dir, "apps", icon_sizes[i].filename, NULL);
 		icon = gdk_pixbuf_new_from_file(icon_path, NULL);
 		g_free(icon_path);
 		if (icon) {
 			icons = g_list_append(icons,icon);
 		} else {
 #endif
 #endif
 	int opt;
 	gboolean gui_check;
 	gboolean debug_enabled;
+	gboolean migration_failed = FALSE;
 	struct option long_options[] = {
 		{"config",   required_argument, NULL, 'c'},
 		{"debug",    no_argument,       NULL, 'd'},
 		{"help",     no_argument,       NULL, 'h'},
 	 * Fire up this baby.
 	 */
 	purple_debug_set_enabled(debug_enabled);
+	/* If we're using a custom configuration directory, we
+	 * do NOT want to migrate, or weird things will happen. */
+	if (opt_config_dir_arg == NULL)
+	{
+		if (!purple_core_migrate())
+		{
+			migration_failed = TRUE;
+		}
+	}
 	search_path = g_build_filename(purple_user_dir(), "gtkrc-2.0", NULL);
 	gtk_rc_add_default_file(search_path);
 	g_free(search_path);
 	}
 #ifdef _WIN32
 	winpidgin_init(hint);
 #endif
+	if (migration_failed)
+	{
+		char *old = g_strconcat(purple_home_dir(),
+		                        G_DIR_SEPARATOR_S ".gaim", NULL);
+		const char *text = _(
+			"%s encountered errors migrating your settings "
+			"from %s to %s. Please investigate and complete the "
+			"migration by hand.");
+		GtkWidget *dialog;
+		dialog = gtk_message_dialog_new(NULL,
+		                                0,
+		                                GTK_MESSAGE_ERROR,
+		                                GTK_BUTTONS_CLOSE,
+		                                text, PIDGIN_NAME,
+		                                old, purple_user_dir());
+		g_free(old);
+		g_signal_connect_swapped(dialog, "response",
+		                         G_CALLBACK(gtk_main_quit), NULL);
+		gtk_widget_show_all(dialog);
+		gtk_main();
+#ifdef HAVE_SIGNAL_H
+		g_free(segfault_message);
+#endif
+		return 0;
+	}
 	purple_core_set_ui_ops(pidgin_core_get_ui_ops());
 	purple_eventloop_set_ui_ops(pidgin_eventloop_get_ui_ops());
 	/*
 		purple_savedstatus_activate(saved_status);
 	}
 	else
 	{
 		/* Everything is good to go--sign on already */
-		if (!purple_prefs_get_bool("/core/savedstatus/startup_current_status"))
+		if (!purple_prefs_get_bool("/purple/savedstatus/startup_current_status"))
 			purple_savedstatus_activate(purple_savedstatus_get_startup());
 		purple_accounts_restore_current_statuses();
 	}
 	if ((accounts = purple_accounts_get_all_active()) == NULL)

Mercurial > pidgin3 / file comparison

comparison: pidgin/gtkmain.c

pidgin/gtkmain.c