GNOME.org
 

[gnac/devel] Updated Makefiles

commit 65f2d3313f4d67d9c66e22cdcf09edb790874451
Author: BenoÃt Dupasquier <bdupasqu src gnome org>
Date:   Sat Jan 21 15:55:43 2012 +0000

    Updated Makefiles

 configure.ac                 |   21 +++++----------------
 data/ui/gnac-pref-window.xml |    5 ++---
 data/ui/gnac.xml             |    9 +++------
 libgnac/Makefile.am          |    4 ++--
 libgnac/libgnac-metadata.c   |    2 +-
 src/Makefile.am              |    6 ++----
 6 files changed, 15 insertions(+), 32 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index b176009..f781f16 100644
--- a/configure.ac
+++ b/configure.ac
@@ -52,7 +52,7 @@ AC_DEFINE_UNQUOTED(
   ["$GETTEXT_PACKAGE"],
   [Define to the full name of the gettext package.])
 AC_SUBST([GETTEXT_PACKAGE])
-IT_PROG_INTLTOOL([0.40.6])
+IT_PROG_INTLTOOL([0.41.1])
 AM_GNU_GETTEXT_VERSION([0.17])
 AM_GLIB_GNU_GETTEXT
 
@@ -66,25 +66,14 @@ GNOME_COMPILE_WARNINGS([maximum])
 GNOME_CXX_WARNINGS([yes])
 GNOME_MAINTAINER_MODE_DEFINES
 
-dnl Find GLib and GObject
-GIO_REQUIRED=2.25.0
-PKG_CHECK_MODULES(GLIB, [
-  gio-2.0 >= $GIO_REQUIRED
-  glib-2.0 
-  gobject-2.0 
-  gthread-2.0
+PKG_CHECK_MODULES(LIBXML, [
   libxml-2.0
 ])
-AC_SUBST(GLIB_CFLAGS)
-AC_SUBST(GLIB_LIBS)
+AC_SUBST(LIBXML_CFLAGS)
+AC_SUBST(LIBXML_LIBS)
 
 dnl Find the UI libraries
-GTK_REQUIRED=2.16
-PKG_CHECK_MODULES(UI, [
-  gtk+-2.0 >= $GTK_REQUIRED
-])
-AC_SUBST(UI_CFLAGS)
-AC_SUBST(UI_LIBS)
+AM_PATH_GTK_2_0
 
 dnl libnotify
 PKG_CHECK_MODULES(NOTIFY,
diff --git a/data/ui/gnac-pref-window.xml b/data/ui/gnac-pref-window.xml
index 11bc9d0..fecd31f 100644
--- a/data/ui/gnac-pref-window.xml
+++ b/data/ui/gnac-pref-window.xml
@@ -27,7 +27,7 @@
         <col id="0" translatable="yes">Artist/Album (Year)</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Custom</col>
+        <col id="0" translatable="yes" context="Folder hierarchy: Custom">Custom</col>
       </row>
     </data>
   </object>
@@ -376,7 +376,6 @@
               <object class="GtkVBox" id="audio">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="extension_events">all</property>
                 <property name="border_width">6</property>
                 <property name="spacing">6</property>
                 <child>
@@ -660,7 +659,7 @@
         <col id="0" translatable="yes">Artist - Number - Title</col>
       </row>
       <row>
-        <col id="0" translatable="yes" comments="Translators: this translation is problematic as gtkbuilder's translation contexts are not yet supported by intltool. The problem should be fixed in intltool 0.41.1. See https://bugs.launchpad.net/intltool/+bug/409781 for more details. In-between the contexts for this translation are 'Folder hierarchy: Custom' and 'Output filename: Custom'">Custom</col>
+        <col id="0" translatable="yes" context="Output filename: Custom">Custom</col>
       </row>
     </data>
   </object>
diff --git a/data/ui/gnac.xml b/data/ui/gnac.xml
index 5c013aa..78b0c9f 100644
--- a/data/ui/gnac.xml
+++ b/data/ui/gnac.xml
@@ -379,7 +379,6 @@
               <object class="GtkStatusbar" id="statusbar">
                 <property name="visible">True</property>
                 <property name="spacing">2</property>
-                <property name="has_resize_grip">True</property>
               </object>
               <packing>
                 <property name="pack_type">end</property>
@@ -404,7 +403,6 @@
     <property name="window_position">center-on-parent</property>
     <property name="type_hint">dialog</property>
     <property name="transient_for">main_window</property>
-    <property name="has_separator">False</property>
     <property name="program_name">Gnac</property>
     <property name="website">http://gnac.sf.net</property>
     <property name="copyright">Copyright &#xA9; 2007-2012 Gnac</property>
@@ -437,7 +435,7 @@ Alexandre Roux &lt;alexroux src gnome org&gt;</property>
         <child internal-child="action_area">
           <object class="GtkHButtonBox" id="dialog-action_area1">
             <property name="visible">True</property>
-            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <property name="layout_style">end</property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -452,8 +450,7 @@ Alexandre Roux &lt;alexroux src gnome org&gt;</property>
     <property name="title" translatable="yes">Open a File...</property>
     <property name="modal">True</property>
     <property name="window_position">center-on-parent</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-    <property name="has_separator">False</property>
+    <property name="type_hint">dialog</property>
     <property name="select_multiple">True</property>
     <property name="use_preview_label">False</property>
     <property name="preview_widget_active">False</property>
@@ -461,7 +458,7 @@ Alexandre Roux &lt;alexroux src gnome org&gt;</property>
     <signal name="key-press-event" handler="gnac_ui_file_chooser_key_press_event_cb"/>
     <signal name="file-activated" handler="gnac_ui_file_chooser_file_activated_cb"/>
     <signal name="response" handler="gnac_ui_file_chooser_response_cb"/>
-    <signal name="destroy" handler="gnac_ui_file_chooser_response_cb"/>
+    <signal name="destroy" handler="gtk_widget_hide"/>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox2">
         <property name="visible">True</property>
diff --git a/libgnac/Makefile.am b/libgnac/Makefile.am
index 786816b..7fcba6a 100644
--- a/libgnac/Makefile.am
+++ b/libgnac/Makefile.am
@@ -29,13 +29,13 @@ libgnac_la_CPPFLAGS = \
 libgnac_la_CFLAGS = \
 	$(WARN_CFLAGS) \
 	$(GSTREAMER_CFLAGS) \
-	$(UI_CFLAGS) \
+	$(GTK_CFLAGS) \
 	-Wl,--export-dynamic \
 	$(AM_CFLAGS)
 
 libgnac_la_LIBADD = \
 	$(GSTREAMER_LIBS) \
-	$(UI_LIBS)
+	$(GTK_LIBS)
 
 libgnac_la_LDFLAGS = \
 	-Wl,--export-dynamic \
diff --git a/libgnac/libgnac-metadata.c b/libgnac/libgnac-metadata.c
index 601f46b..9cba697 100644
--- a/libgnac/libgnac-metadata.c
+++ b/libgnac/libgnac-metadata.c
@@ -27,7 +27,7 @@
 #include "config.h"
 #endif
 
-#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gdk/gdk.h>
 #include <glib/gi18n.h>
 #include <gst/gst.h>
 #include <gst/tag/tag.h>
diff --git a/src/Makefile.am b/src/Makefile.am
index 3cc5f02..fffd4b1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -71,20 +71,18 @@ gnac_CPPFLAGS = \
 
 gnac_CFLAGS = \
 	$(AM_CFLAGS) \
-	$(GLIB_CFLAGS) \
 	$(GSTREAMER_CFLAGS) \
+	$(GTK_CFLAGS) \
 	$(NOTIFY_CFLAGS) \
-	$(UI_CFLAGS) \
 	$(UNIQUE_CFLAGS) \
 	$(WARN_CFLAGS) \
 	-Wl,--export-dynamic
 		
 gnac_LDADD = \
 	$(top_builddir)/libgnac/libgnac.la \
-	$(GLIB_LIBS) \
 	$(GSTREAMER_LIBS) \
+	$(GTK_LIBS) \
 	$(NOTIFY_LIBS) \
-	$(UI_LIBS) \
 	$(UNIQUE_LIBS)
 
 gnac_LDFLAGS = \
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]