Permalink
Browse files

Pho 0.9.7-pre3, 2009-12-15:

  More cleanup of rotation/scaling, and transitions from one mode to
the next.
  • Loading branch information...
1 parent 4bff3dc commit 89712de784872f1e69656e7aabd4a63de2f0162c @akkana committed Jan 12, 2010
Showing with 113 additions and 119 deletions.
  1. +2 −2 Makefile
  2. +3 −3 README
  3. +1 −1 gdialogs.c
  4. +3 −3 gmain.c
  5. +104 −110 pho.c
View
@@ -1,9 +1,9 @@
# Makefile for pho
-VERSION = 0.9.7-pre2
+VERSION = 0.9.7-pre3
# Locate the gtk/gdk libraries (thanks to nev for this!)
-CFLAGS = -g -Wall -pedantic -DVERSION='"$(VERSION)"'
+CFLAGS += -g -Wall -pedantic -DVERSION='"$(VERSION)"'
G1FLAGS := $(shell gdk-pixbuf-config --cflags 2> /dev/null)
G2FLAGS := $(shell pkg-config --cflags gtk+-2.0 gdk-2.0 2> /dev/null)
CFLAGS := $(CFLAGS) $(shell if test -n "${G2FLAGS}"; then echo "${G2FLAGS}"; else echo "${G1FLAGS}"; fi)
View
@@ -19,7 +19,7 @@ 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 Foobar; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+You should have received a copy of the GNU General Public License along
+with Pho (see COPYING); if not, write to the Free Software Foundation, Inc.,
+59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
</GPL_boilerplate>
View
@@ -459,7 +459,7 @@ int Prompt(char* msg, char* yesStr, char* noStr, char* yesChars, char* noChars)
GTK_DIALOG_MODAL,
yesStr, 1,
noStr, 0,
- 0);
+ NULL);
KeepOnTop(promptDialog);
/* Make sure Enter will activate OK, not Cancel */
View
@@ -287,11 +287,11 @@ static void CheckArg(char* arg)
else if (*arg == 'n')
gMakeNewWindows = 1;
else if (*arg == 'p')
- SetViewModes(PHO_DISPLAY_PRESENTATION, gScaleMode, gScaleRatio);
+ gDisplayMode = PHO_DISPLAY_PRESENTATION;
else if (*arg == 'P')
- SetViewModes(PHO_DISPLAY_NORMAL, gScaleMode, gScaleRatio);
+ gDisplayMode = PHO_DISPLAY_NORMAL;
else if (*arg == 'k')
- SetViewModes(PHO_DISPLAY_KEYWORDS, gScaleMode, gScaleRatio);
+ gDisplayMode = PHO_DISPLAY_KEYWORDS;
else if (*arg == 's') {
/* find the slideshow delay time, from e.g. pho -s2 */
if (isdigit(arg[1]))
Oops, something went wrong.

0 comments on commit 89712de

Please sign in to comment.