From 50ba6d2ea8219ef2ec7b69e027b2a0f8f803e5a6 Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <mpg@redhat.com>
Date: Fri, 17 Jun 2005 10:58:37 +0000
Subject: Better makefile for toolbar editor and update everything to latest libegg.

2005-06-17  Marco Pesenti Gritti  <mpg@redhat.com>

        * configure.ac:
        * cut-n-paste/recent-files/egg-recent-model.c:
        (egg_recent_model_write_raw), (egg_recent_model_lock_file),
        (egg_recent_model_unlock_file):
        * cut-n-paste/recent-files/egg-recent-util.c:
        (egg_recent_util_get_unique_id):
        * cut-n-paste/recent-files/update-from-egg.sh:
        * cut-n-paste/toolbar-editor/Makefile.am:
        * cut-n-paste/toolbar-editor/egg-editable-toolbar.c:
        * cut-n-paste/toolbar-editor/egg-editable-toolbar.h:
        * cut-n-paste/toolbar-editor/egg-toolbar-editor.c:
        * cut-n-paste/toolbar-editor/egg-toolbars-model.c:
        (egg_toolbars_model_get_type):
        * cut-n-paste/toolbar-editor/egg-toolbars-model.h:

        Better makefile for toolbar editor and update everything
        to latest libegg.
---
(limited to 'cut-n-paste/recent-files')

diff --git a/cut-n-paste/recent-files/egg-recent-model.c b/cut-n-paste/recent-files/egg-recent-model.c
index 8b3abe5..067a635 100644
--- a/cut-n-paste/recent-files/egg-recent-model.c
+++ b/cut-n-paste/recent-files/egg-recent-model.c
@@ -193,7 +193,9 @@ egg_recent_model_write_raw (EggRecentModel *model, FILE *file,
 	if (fputs (content, file) == EOF)
 		return FALSE;
 
+#ifndef G_OS_WIN32
 	fsync (fd);
+#endif
 	rewind (file);
 
 	return TRUE;
@@ -884,6 +886,7 @@ egg_recent_model_open_file (EggRecentModel *model)
 static gboolean
 egg_recent_model_lock_file (FILE *file)
 {
+#ifdef F_TLOCK
 	int fd;
 	gint	try = 5;
 
@@ -913,17 +916,24 @@ egg_recent_model_lock_file (FILE *file)
 	}
 
 	return FALSE;
+#else
+	return TRUE;
+#endif
 }
 
 static gboolean
 egg_recent_model_unlock_file (FILE *file)
 {
+#ifdef F_TLOCK
 	int fd;
 
 	rewind (file);
 	fd = fileno (file);
 
 	return (lockf (fd, F_ULOCK, 0) == 0) ? TRUE : FALSE;
+#else
+	return TRUE;
+#endif
 }
 
 static void
diff --git a/cut-n-paste/recent-files/egg-recent-util.c b/cut-n-paste/recent-files/egg-recent-util.c
index 6780cd1..bc15a06 100644
--- a/cut-n-paste/recent-files/egg-recent-util.c
+++ b/cut-n-paste/recent-files/egg-recent-util.c
@@ -12,6 +12,10 @@
 #include <math.h>
 #include "egg-recent-util.h"
 
+#ifdef G_OS_WIN32
+#include <windows.h>
+#endif
+
 #define EGG_RECENT_UTIL_HOSTNAME_SIZE 512
 
 /* ripped out of gedit2 */
@@ -128,7 +132,14 @@ egg_recent_util_get_unique_id (void)
 	guint32 rand;
 	int pid;
 	
+#ifndef G_OS_WIN32
 	gethostname (hostname, EGG_RECENT_UTIL_HOSTNAME_SIZE);
+#else
+	{
+		DWORD size = EGG_RECENT_UTIL_HOSTNAME_SIZE;
+		GetComputerName (hostname, &size);
+	}
+#endif
 	
 	time (&the_time);
 	rand = g_random_int ();
diff --git a/cut-n-paste/recent-files/update-from-egg.sh b/cut-n-paste/recent-files/update-from-egg.sh
deleted file mode 100755
index 9be68a9..0000000
--- a/cut-n-paste/recent-files/update-from-egg.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-
-function die() {
-  echo $*
-  exit 1
-}
-
-if test -z "$EGGDIR"; then
-   echo "Must set EGGDIR"
-   exit 1
-fi
-
-if test -z "$EGGFILES"; then
-   echo "Must set EGGFILES"
-   exit 1
-fi
-
-for FILE in $EGGFILES; do
-  if cmp -s $EGGDIR/$FILE $FILE; then
-     echo "File $FILE is unchanged"
-  else
-     cp $EGGDIR/$FILE $FILE || die "Could not move $EGGDIR/$FILE to $FILE"
-     echo "Updated $FILE"
-  fi
-done
--
cgit v0.9.1