r288 - trunk
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Fri May 18 15:31:22 EDT 2007
Author: icculus
Date: 2007-05-18 15:31:21 -0400 (Fri, 18 May 2007)
New Revision: 288
Modified:
trunk/gui.h
trunk/gui_gtkplus2.c
trunk/gui_macosx.c
trunk/gui_stdio.c
Log:
Some general GUI tweaks.
Modified: trunk/gui.h
===================================================================
--- trunk/gui.h 2007-05-18 18:39:53 UTC (rev 287)
+++ trunk/gui.h 2007-05-18 19:31:21 UTC (rev 288)
@@ -22,6 +22,7 @@
MOJOGUI_PRIORITY_TRY_FIRST,
MOJOGUI_PRIORITY_TRY_NORMAL,
MOJOGUI_PRIORITY_TRY_LAST,
+ MOJOGUI_PRIORITY_TRY_ABSOLUTELY_LAST,
MOJOGUI_PRIORITY_TOTAL
} MojoGuiPluginPriority;
Modified: trunk/gui_gtkplus2.c
===================================================================
--- trunk/gui_gtkplus2.c 2007-05-18 18:39:53 UTC (rev 287)
+++ trunk/gui_gtkplus2.c 2007-05-18 19:31:21 UTC (rev 288)
@@ -171,7 +171,12 @@
int tmpargc = 0;
char *args[] = { NULL, NULL };
char **tmpargv = args;
- return gtk_init_check(&tmpargc, &tmpargv) ? true : false;
+ if (!gtk_init_check(&tmpargc, &tmpargv))
+ {
+ entry->logInfo("gtkplus2: gtk_init_check() failed, use another UI.");
+ return false;
+ } // if
+ return true;
} // MojoGui_gtkplus2_init
Modified: trunk/gui_macosx.c
===================================================================
--- trunk/gui_macosx.c 2007-05-18 18:39:53 UTC (rev 287)
+++ trunk/gui_macosx.c 2007-05-18 19:31:21 UTC (rev 288)
@@ -27,6 +27,7 @@
static uint8 MojoGui_macosx_priority(void)
{
+ // obviously this is the thing you want on Mac OS X.
return MOJOGUI_PRIORITY_TRY_FIRST;
} // MojoGui_macosx_priority
@@ -43,7 +44,11 @@
SetFrontProcess(&psn);
} // if
- return true;
+ // !!! FIXME: make sure we have access to the desktop...may be ssh'd in
+ // !!! FIXME: as another user that doesn't have the Finder loaded or
+ // !!! FIXME: something.
+
+ return true; // always succeeds.
} // MojoGui_macosx_init
static void MojoGui_macosx_deinit(void)
Modified: trunk/gui_stdio.c
===================================================================
--- trunk/gui_stdio.c 2007-05-18 18:39:53 UTC (rev 287)
+++ trunk/gui_stdio.c 2007-05-18 19:31:21 UTC (rev 288)
@@ -75,7 +75,7 @@
static uint8 MojoGui_stdio_priority(void)
{
- return MOJOGUI_PRIORITY_TRY_LAST; // always a last resort.
+ return MOJOGUI_PRIORITY_TRY_ABSOLUTELY_LAST; // always a last resort.
} // MojoGui_stdio_priority
More information about the mojosetup-commits
mailing list