Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

adapt to recent api changes variable declaration at the beginning of a

2007-12-09  Hans Breuer  <hans@breuer.org>

	* tests/gio-ls.c : adapt to recent api changes
	* tests/testglib.c : variable declaration at the beginning of a block
	
	(Lieven van der Heide, #503602)
	* win32-fixup.pl : process *.rc.in as well; substitute 
	LT_CURRENT_MINUS_AGE
	* glib/makefile.msc.in : alphabetic sorting of OBJECTS


svn path=/trunk/; revision=6184
  • Loading branch information...
commit 1cda3c9e017ce9359d5019bb7bc8993208523891 1 parent 2c0f3fc
authored Hans Breuer committed
10  ChangeLog
... ...
@@ -1,3 +1,13 @@
  1
+2007-12-09  Hans Breuer  <hans@breuer.org>
  2
+
  3
+	* tests/gio-ls.c : adapt to recent api changes
  4
+	* tests/testglib.c : variable declaration at the beginning of a block
  5
+	
  6
+	(Lieven van der Heide, #503602)
  7
+	* win32-fixup.pl : process *.rc.in as well; substitute 
  8
+	LT_CURRENT_MINUS_AGE
  9
+	* glib/makefile.msc.in : alphabetic sorting of OBJECTS
  10
+
1 11
 2007-12-20  Matthias Clasen  <mclasen@redhat.com>
2 12
 
3 13
 	* configure.in: Bump version
8  glib/makefile.msc.in
@@ -51,22 +51,22 @@ glib_OBJECTS =			\
51 51
 	gfileutils.obj		\
52 52
 	ghash.obj		\
53 53
 	ghook.obj		\
54  
-	gkeyfile.obj		\
55  
-	gmappedfile.obj	\
56 54
 	giochannel.obj		\
57 55
 	giowin32.obj		\
  56
+	gkeyfile.obj		\
58 57
 	glist.obj		\
59 58
 	gmain.obj		\
  59
+	gmappedfile.obj	\
60 60
 	gmarkup.obj		\
61 61
 	gmem.obj		\
62 62
 	gmessages.obj		\
63 63
 	gnode.obj		\
64 64
 	goption.obj	\
  65
+	gpattern.obj	\
65 66
 	gprimes.obj		\
  67
+	gprintf.obj	\
66 68
 	gqsort.obj		\
67 69
 	gqueue.obj		\
68  
-	gpattern.obj	\
69  
-	gprintf.obj	\
70 70
 	grand.obj		\
71 71
 	gregex.obj		\
72 72
 	grel.obj		\
20  tests/gio-ls.c
... ...
@@ -1,5 +1,4 @@
1 1
 
2  
-#include <glib/goption.h>
3 2
 #include <gio/gio.h>
4 3
 
5 4
 #define GETTEXT_PACKAGE "gio-ls"
@@ -61,7 +60,7 @@ print_path (const gchar* path,
61 60
             guint32      flags)
62 61
 {
63 62
   GFile *top;
64  
-  const gchar *short_attrs = G_FILE_ATTRIBUTE_STD_NAME;
  63
+  const gchar *short_attrs = G_FILE_ATTRIBUTE_STANDARD_NAME;
65 64
   const gchar *long_attrs = G_FILE_ATTRIBUTE_OWNER_USER "," G_FILE_ATTRIBUTE_OWNER_GROUP "," \
66 65
 			    "access:*,std:*";
67 66
   const gchar *attrs;
@@ -92,7 +91,7 @@ print_path (const gchar* path,
92 91
 
93 92
           if (flags & SHOW_LONG)
94 93
 	    {
95  
-	      GFileAttributeValue *val = g_file_info_get_attribute (info, G_FILE_ATTRIBUTE_OWNER_USER);
  94
+	      const gchar *val;
96 95
 	      
97 96
 	      g_print ("%c%c%c%c ",
98 97
 		g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY ? 'd' : '-',
@@ -100,19 +99,14 @@ print_path (const gchar* path,
100 99
 		g_file_info_get_attribute_boolean (info, G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE) ? 'w' : '-',
101 100
 		g_file_info_get_attribute_boolean (info, G_FILE_ATTRIBUTE_ACCESS_CAN_EXECUTE) ? 'x' : '-');
102 101
 
103  
-	      if (!val)
104  
-	        g_print ("\t?");
105  
-              else if (val->type == G_FILE_ATTRIBUTE_TYPE_STRING)
106  
-	        g_print ("\t%15s", val->u.string);
  102
+	      val = g_file_info_get_attribute_string (info, G_FILE_ATTRIBUTE_OWNER_USER);
  103
+	      g_print ("\t%15s", val ? val : "?user?");
107 104
 
108  
-	      val = g_file_info_get_attribute (info, G_FILE_ATTRIBUTE_OWNER_GROUP);
109  
-	      if (!val)
110  
-	        g_print ("\t?");
111  
-              else if (val->type == G_FILE_ATTRIBUTE_TYPE_STRING)
112  
-	        g_print ("\t%15s", val->u.string);
  105
+	      val = g_file_info_get_attribute_string (info, G_FILE_ATTRIBUTE_OWNER_GROUP);
  106
+	      g_print ("\t%15s", val ? val : "?group?");
113 107
 	    }
114 108
 	    
115  
-	  g_print ("\t%s\n", name ? name : "<NULL>");
  109
+	  g_print ("\t%s\n", name ? name : "?noname?");
116 110
 
117 111
 	  g_object_unref (info);
118 112
 	}
7  tests/testglib.c
@@ -819,6 +819,9 @@ test_info (void)
819 819
   
820 820
   if (g_test_verbose())
821 821
     {
  822
+#ifdef G_PLATFORM_WIN32
  823
+      gchar *glib_dll;
  824
+#endif
822 825
       const gchar *charset;
823 826
       if (g_get_charset ((G_CONST_RETURN char**)&charset))
824 827
         g_print ("current charset is UTF-8: %s\n", charset);
@@ -828,10 +831,10 @@ test_info (void)
828 831
 #ifdef G_PLATFORM_WIN32
829 832
 #ifdef G_OS_WIN32
830 833
       /* Can't calculate GLib DLL name at runtime. */
831  
-      gchar *glib_dll = "libglib-2.0-0.dll";
  834
+      glib_dll = "libglib-2.0-0.dll";
832 835
 #endif
833 836
 #ifdef G_WITH_CYGWIN
834  
-      gchar *glib_dll = "cygglib-2.0-0.dll";
  837
+      glib_dll = "cygglib-2.0-0.dll";
835 838
 #endif
836 839
 
837 840
       g_print ("current locale: %s\n", g_win32_getlocale ());
6  win32-fixup.pl
@@ -6,6 +6,7 @@
6 6
 $binary_age = 0;
7 7
 $interface_age = 0;
8 8
 $gettext_package = "glib20";
  9
+$current_minus_age = 0;
9 10
 
10 11
 sub process_file
11 12
 {
@@ -22,6 +23,7 @@ sub process_file
22 23
 	    s/\@GLIB_INTERFACE_AGE\@/$interface_age/g;
23 24
 	    s/\@GLIB_BINARY_AGE\@/$binary_age/g;
24 25
 	    s/\@GETTEXT_PACKAGE\@/$gettext_package/g;
  26
+	    s/\@LT_CURRENT_MINUS_AGE@/$current_minus_age/g;
25 27
 	    print OUTPUT;
26 28
 	}
27 29
 }
@@ -29,7 +31,11 @@ sub process_file
29 31
 process_file ("config.h.win32");
30 32
 process_file ("glibconfig.h.win32");
31 33
 process_file ("glib/makefile.msc");
  34
+process_file ("glib/glib.rc");
32 35
 process_file ("gmodule/makefile.msc");
  36
+process_file ("gmodule/gmodule.rc");
33 37
 process_file ("gobject/makefile.msc");
  38
+process_file ("gobject/gobject.rc");
34 39
 process_file ("gthread/makefile.msc");
  40
+process_file ("gthread/gthread.rc");
35 41
 process_file ("tests/makefile.msc");

0 notes on commit 1cda3c9

Please sign in to comment.
Something went wrong with that request. Please try again.