Attachment 201141 Details for Bug 297021 – autostart infrastructure, take 2

[patch] autostart infrastructure, take 2

pidgin-2.1.1-autostart.patch (text/plain), 4.67 KB, created by Colin Walters on 2007-09-20 18:36:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Colin Walters

Created: 2007-09-20 18:36:48 UTC

Size: 4.67 KB

patch

obsolete

>diff -up pidgin-2.1.1/Makefile.am.autostart pidgin-2.1.1/Makefile.am
>--- pidgin-2.1.1/Makefile.am.autostart	2007-08-20 14:12:48.000000000 -0400
>+++ pidgin-2.1.1/Makefile.am	2007-09-19 17:02:41.000000000 -0400
>@@ -17,6 +17,7 @@ EXTRA_DIST = \
> 		pidgin.apspec.in \
> 		pidgin.spec.in \
> 		pidgin.desktop.in \
>+		im.pidgin.purple.PurpleService.service.in \
> 		po/Makefile.mingw \
> 		valgrind-suppressions
> 
>@@ -34,6 +35,13 @@ apps_in_files = pidgin.desktop.in
> apps_DATA = $(apps_in_files:.desktop.in=.desktop)
> @INTLTOOL_DESKTOP_RULE@
> 
>+# DBus service file
>+servicedir = $(datadir)/dbus-1/services
>+service_in_files = im.pidgin.purple.PurpleService.service.in
>+service_DATA = $(service_in_files:.service.in=.service)
>+$(service_DATA): $(service_in_files) Makefile
>+	@sed -e "s|\@bindir\@|$(bindir)|" $< > $@
>+
> if ENABLE_GTK
> GTK_DIR=pidgin
> endif
>@@ -59,5 +67,5 @@ endif
> distuninstallcheck_listfiles = \
> 	find . -type f -print | grep -v perl | grep -v Purple.3pm
> 
>-DISTCLEANFILES= pidgin.desktop libpurple/gconf/purple.schemas intltool-extract \
>+DISTCLEANFILES= pidgin.desktop im.pidgin.purple.PurpleService.service libpurple/gconf/purple.schemas intltool-extract \
> 			intltool-merge intltool-update
>diff -up pidgin-2.1.1/pidgin/gtkmain.c.autostart pidgin-2.1.1/pidgin/gtkmain.c
>--- pidgin-2.1.1/pidgin/gtkmain.c.autostart	2007-08-20 14:12:54.000000000 -0400
>+++ pidgin-2.1.1/pidgin/gtkmain.c	2007-09-19 17:03:33.000000000 -0400
>@@ -392,6 +392,7 @@ show_usage(const char *name, gboolean te
> 		       "  -h, --help          display this help and exit\n"
> 		       "  -m, --multiple      do not ensure single instance\n"
> 		       "  -n, --nologin       don't automatically login\n"
>+		       "  -a, --autostart     autostarted mode - no first time setup, etc.\n"
> 		       "  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
> 		       "                      account(s) to use, separated by commas)\n"
> 		       "  -v, --version       display the current version and exit\n"), PIDGIN_NAME, VERSION, name);
>@@ -449,6 +450,7 @@ int main(int argc, char *argv[])
> 	gboolean opt_help = FALSE;
> 	gboolean opt_login = FALSE;
> 	gboolean opt_nologin = FALSE;
>+	gboolean opt_autostart = FALSE;
> 	gboolean opt_version = FALSE;
> 	gboolean opt_si = TRUE;     /* Check for single instance? */
> 	char *opt_config_dir_arg = NULL;
>@@ -470,7 +472,7 @@ int main(int argc, char *argv[])
> 	gboolean gui_check;
> 	gboolean debug_enabled;
> 	gboolean migration_failed = FALSE;
>-	GList *active_accounts;
>+	GList *active_accounts = NULL;
> 
> 	struct option long_options[] = {
> 		{"config",   required_argument, NULL, 'c'},
>@@ -479,6 +481,7 @@ int main(int argc, char *argv[])
> 		{"login",    optional_argument, NULL, 'l'},
> 		{"multiple", no_argument,       NULL, 'm'},
> 		{"nologin",  no_argument,       NULL, 'n'},
>+		{"autostart",no_argument,       NULL, 'a'},
> 		{"session",  required_argument, NULL, 's'},
> 		{"version",  no_argument,       NULL, 'v'},
> 		{0, 0, 0, 0}
>@@ -591,9 +594,9 @@ int main(int argc, char *argv[])
> 	opterr = 1;
> 	while ((opt = getopt_long(argc, argv,
> #ifndef _WIN32
>-				  "c:dhmnl::s:v",
>+				  "c:dhmnal::s:v",
> #else
>-				  "c:dhnl::v",
>+				  "c:dhnal::v",
> #endif
> 				  long_options, NULL)) != -1) {
> 		switch (opt) {
>@@ -610,6 +613,9 @@ int main(int argc, char *argv[])
> 		case 'n':	/* no autologin */
> 			opt_nologin = TRUE;
> 			break;
>+		case 'a':	/* autostart mode */
>+			opt_autostart = TRUE;
>+			break;
> 		case 'l':	/* login, option username */
> 			opt_login = TRUE;
> 			g_free(opt_login_arg);
>@@ -817,7 +823,8 @@ int main(int argc, char *argv[])
> 	 * We want to show the blist early in the init process so the
> 	 * user feels warm and fuzzy (not cold and prickley).
> 	 */
>-	purple_blist_show();
>+	if (!opt_autostart)
>+		purple_blist_show();
> 
> 	if (purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/debug/enabled"))
> 		pidgin_debug_window_show();
>@@ -863,7 +870,7 @@ int main(int argc, char *argv[])
> 		purple_accounts_restore_current_statuses();
> 	}
> 
>-	if ((active_accounts = purple_accounts_get_all_active()) == NULL)
>+	if (!opt_autostart && (active_accounts = purple_accounts_get_all_active()) == NULL)
> 	{
> 		pidgin_accounts_window_show();
> 	}
>diff -up /dev/null pidgin-2.1.1/im.pidgin.purple.PurpleService.service.in
>--- /dev/null	2007-09-18 09:45:21.610819165 -0400
>+++ pidgin-2.1.1/im.pidgin.purple.PurpleService.service.in	2007-09-19 17:02:41.000000000 -0400
>@@ -0,0 +1,4 @@
>+[D-BUS Service]
>+Name=im.pidgin.purple.PurpleService
>+Exec=@bindir@/pidgin -a
>+
>--- pidgin-2.1.1.patched/pidgin/gtkblist.c	2007-08-20 14:12:53.000000000 -0400
>+++ pidgin-2.1.1/pidgin/gtkblist.c	2007-09-20 10:17:25.000000000 -0400
>@@ -5936,7 +5936,9 @@
> 		} else {
> 			purple_blist_set_visible(TRUE);
> 		}
>-	}
>+	} else {
>+    purple_blist_show();
>+  }
> }
> 
> void

Actions: View | Diff

Attachments on bug 297021: 200151 | 200171 | 201141