[Pkg-maemo-commits] r37 ./hildon-help/debian: * Merge with trunk branch.
Jonny Lamb
jonnylamb at jonnylamb.com
Sun Jul 22 23:08:55 UTC 2007
------------------------------------------------------------
revno: 37
committer: Jonny Lamb <jonnylamb at jonnylamb.com>
branch nick: hildon-help
timestamp: Mon 2007-07-23 00:08:55 +0100
message:
* Merge with trunk branch.
modified:
ChangeLog
configure.ac
debian/changelog
debian/control
src/Makefile.am
src/graphic.c
src/hildon-help.h
src/osso-helplib.c
------------------------------------------------------------
revno: 12.1.1
merged: vcs-imports at canonical.com-20070531180426-hzrcvm0wu3qhldmm
committer: schulhof
timestamp: Thu 2007-05-31 18:04:26 +0000
message:
removed libart_lgpl. RIP.
------------------------------------------------------------
revno: 12.1.2
merged: vcs-imports at canonical.com-20070531180512-3hvym8a1x8n2ndgp
committer: schulhof
timestamp: Thu 2007-05-31 18:05:12 +0000
message:
Forgot the ChangeLog
------------------------------------------------------------
revno: 12.1.3
merged: vcs-imports at canonical.com-20070628122229-6tv7x40klnce28mi
committer: schulhof
timestamp: Thu 2007-06-28 12:22:29 +0000
message:
* Stop eating client messages
* Fixes: NB#61917
------------------------------------------------------------
revno: 12.1.4
merged: vcs-imports at canonical.com-20070702152737-tpw4xjgci0yllk1m
committer: schulhof
timestamp: Mon 2007-07-02 15:27:37 +0000
message:
* Remove direct dependency on libpng and libjpeg via gdk_pixbuf_get_file_info()
* Patch from Tommi Komulainen
------------------------------------------------------------
revno: 12.1.5
merged: vcs-imports at canonical.com-20070710130304-ueqms73616t4zwng
committer: pavelek
timestamp: Tue 2007-07-10 13:03:04 +0000
message:
removed comma from the end of the list of enums
-------------- next part --------------
=== modified file 'ChangeLog'
--- a/ChangeLog 2007-03-16 09:30:59 +0000
+++ b/ChangeLog 2007-07-02 15:27:37 +0000
@@ -1,3 +1,17 @@
+2007-07-02 Gabriel Schulhof <gabriel.schulhof at nokia.com>
+
+ * Remove direct dependency on libpng and libjpeg via gdk_pixbuf_get_file_info()
+ * Patch from Tommi Komulainen
+
+2007-06-28 Gabriel Schulhof <gabriel.schulhof at nokia.com>
+
+ * Stop eating client messages
+ * Fixes: NB#61917
+
+2007-05-31 Gabriel Schulhof <gabriel.schulhof at nokia.com>
+
+ * Removed dependency on libart_lgpl
+
2007-03-15 Gabriel Schulhof <gabriel.schulhof at nokia.com>
* Re-implemented help dialog
=== modified file 'configure.ac'
--- a/configure.ac 2007-05-29 10:46:26 +0000
+++ b/configure.ac 2007-07-22 23:08:55 +0000
@@ -7,7 +7,7 @@
# Mandatory, initializes autoconf.
#
-AC_INIT(libhildonhelp, 1.9.1)
+AC_INIT(libhildonhelp, 1.9.3)
# Tests that source dir exists
AC_CONFIG_SRCDIR(src/hildon-help.h)
@@ -37,20 +37,11 @@
glib-2.0 >= 2.6
hildon-1 >= 1.0.0
libosso >= 1.0.0
- libpng
- libgtkhtml-3.14
+ libgtkhtml-3.8
)
AC_SUBST( DEPS_CFLAGS )
AC_SUBST( DEPS_LIBS )
-AC_CHECK_LIB([jpeg], [jpeg_read_header], [have_jpeg="yes"], [have_jpeg="no"])
-if test x$have_jpeg = xyes;then
- JPEG_LIBS="-ljpeg"
-else
- AC_ERROR([Library libjpeg not found.])
-fi
-AC_SUBST( JPEG_LIBS )
-
# Localisation-related
#
GETTEXT_PACKAGE=osso-help
=== modified file 'debian/changelog'
--- a/debian/changelog 2007-07-22 22:54:22 +0000
+++ b/debian/changelog 2007-07-22 23:08:55 +0000
@@ -1,4 +1,4 @@
-libhildonhelp (1.9.1-1) UNRELEASED; urgency=low
+libhildonhelp (1.9.3-1) UNRELEASED; urgency=low
* Set maintainer to Debian Maemo Maintainers.
* Wrap build-deps and deps.
@@ -6,8 +6,29 @@
* Bump up Standards-Version to 3.7.2.
* Update Makefile.am to not dist debian/* files in make dist tarballs.
* Add watch file.
-
- -- Jonny Lamb <jonnylamb at jonnylamb.com> Sun, 22 Jul 2007 23:54:11 +0100
+ * Merge with trunk branch.
+
+ -- Jonny Lamb <jonnylamb at jonnylamb.com> Mon, 23 Jul 2007 00:02:34 +0100
+
+libhildonhelp (1.9.3-1) unstable; urgency=low
+
+ * Remove direct dependency on libpng and libjpeg via gdk_pixbuf_get_file_info()
+ * Patch from Tommi Komulainen
+
+ -- Gabriel Schulhof <gabriel.schulhof at nokia.com> Mon, 2 Jul 2007 15:51:35 +0300
+
+libhildonhelp (1.9.2-1) unstable; urgency=low
+
+ * Stop eating client messages
+ * Fixes: NB#61917
+
+ -- Gabriel Schulhof <gabriel.schulhof at nokia.com> Thu, 28 Jun 2007 15:19:44 +0300
+
+libhildonhelp (1.9.1-2) unstable; urgency=low
+
+ * Removed debian/control dependency on libart_lgpl
+
+ -- Gabriel Schulhof <gabriel.schulhof at nokia.com> Thu, 31 May 2007 21:03:36 +0300
libhildonhelp (1.9.1-1ubuntu3) gutsy; urgency=low
=== modified file 'debian/control'
--- a/debian/control 2007-07-22 22:47:43 +0000
+++ b/debian/control 2007-07-22 23:08:55 +0000
@@ -14,9 +14,6 @@
automake1.7,
libtool,
libgtkhtml3.14-dev (>= 3.9.1),
- libart-2.0-dev,
- libpng12-dev,
- libjpeg62-dev,
libxml2-dev
Standards-Version: 3.7.2
=== modified file 'src/Makefile.am'
--- a/src/Makefile.am 2007-03-14 15:46:21 +0000
+++ b/src/Makefile.am 2007-07-02 15:27:37 +0000
@@ -25,7 +25,7 @@
# Added to allow prelinkage
# Changed to '_LIBADD'
#
-libhildonhelp_la_LDFLAGS=@DEPS_LIBS@ @JPEG_LIBS@
+libhildonhelp_la_LDFLAGS=@DEPS_LIBS@
#libhildonhelp_la_LIBADD=$(DEPS_LIBS)
libhildonhelp_la_includedir = $(includedir)/hildon-help/hildon
=== modified file 'src/graphic.c'
--- a/src/graphic.c 2007-03-13 13:04:06 +0000
+++ b/src/graphic.c 2007-07-02 15:27:37 +0000
@@ -26,10 +26,6 @@
#include <gtk/gtk.h>
-#include <png.h> /* libpng */
-#include <jpeglib.h> /* linjpeg */
-#include <setjmp.h> /* Used for libjpeg error handling */
-
/* Height limit for showing a pic in full size
*
* This should be around the size of 'normal' Help text in browser.
@@ -40,109 +36,6 @@
/*---( HelpLib portion -- HTML conversion )---*/
/**
- Get the resolution (width & height) of a .PNG picture
-
- @param fn filename
- @param wref reference to store the width
- @param href reference to store the height
- @return #TRUE for success
-*/
-static
-gboolean png_resolution( const char *fname, guint *wref, guint *href )
-{
- gboolean ok= FALSE;
- FILE *f;
-
- /* TBD: Could optimize this by keeping the 'png_p' and 'info_p'
- * structures alive (static), but it didn't seem to work
- * as expected.. So, for now they're made afresh each time.
- */
-
- png_structp png_p=
- png_create_read_struct( PNG_LIBPNG_VER_STRING,
- NULL, NULL, NULL );
- if (!png_p) {
- ULOG_DEBUG ("libPNG error: Unable to init 'png_p'!\n" );
- return FALSE;
- }
-
- png_infop info_p= png_create_info_struct( png_p );
- if (!info_p) {
- png_destroy_read_struct( &png_p, NULL, NULL );
- ULOG_DEBUG ("libPNG error: Unable to init 'info_p'!\n" );
- return FALSE;
- }
-
- /* libPNG set up, let's see the file */
- f= fopen( fname, "rb" );
- if (f) {
- /*void*/ png_init_io( png_p, f );
- /*void*/ png_read_info( png_p, info_p );
-
- fclose(f), f=NULL; /* we got what we wanted, thanks */
-
- if (wref) *wref= info_p->width;
- if (href) *href= info_p->height;
-
- ok= TRUE;
- }
-
- png_destroy_read_struct( &png_p, &info_p, NULL );
-
- return ok;
-}
-
-
-static
-void jpeg_error_exit(j_common_ptr cinfo)
-{
- /* Return control to the setjmp point */
- longjmp(cinfo->client_data, 1);
-}
-
-static
-gboolean jpeg_resolution( const char *fname, guint *wref, guint *href )
-{
- gboolean ok= FALSE;
- FILE *f = NULL;
- jmp_buf setjmp_buffer;
- struct jpeg_decompress_struct cinfo;
- struct jpeg_error_mgr jerr;
-
- jpeg_create_decompress(&cinfo);
- cinfo.err = jpeg_std_error(&jerr);
- jerr.error_exit = jpeg_error_exit;
- cinfo.client_data = (void *) &setjmp_buffer;
-
- f= fopen( fname, "rb" );
- if (setjmp(setjmp_buffer)) {
- /* If we get here, the JPEG code has signaled an error and
- we got here by the longjmp call in jpeg_error_exit */
- /* Nothing is done here because destroying of jpeg data structure
- and closing of file is doen in common code to successfull case */
- }
- else
- {
- /* This part is normally run */
- if (f) {
- jpeg_stdio_src(&cinfo, f);
- jpeg_read_header(&cinfo, TRUE);
-
- if (wref) *wref= cinfo.image_width;
- if (href) *href= cinfo.image_height;
-
- ok= TRUE;
- }
- }
-
- jpeg_destroy_decompress(&cinfo);
- fclose(f), f=NULL;
-
- return ok;
-}
-
-
-/**
Write an HTML tag entry for an inline picture to 'buf'.
Note: Picture is scaled to "browser default text size" (whichever that is)
@@ -163,27 +56,13 @@
*
* snprintf( buf, bufsize, "<img src=\"file://%s\"/>", fname );
*/
- if (strstr( fname, ".png" )) {
- ULOG_DEBUG ("PNG processing: %s\n", fname );
-
- ok= png_resolution( fname, &w, &h );
-
- if (ok) {
- ULOG_DEBUG("PNG resolution: %dx%d\n", w, h );
- } else {
- ULOG_DEBUG ("PNG resolution: failed\n" );
- }
- }
- else if (strstr( fname, ".jpg" ) || strstr( fname, ".jpeg" )) {
- ULOG_DEBUG ("JPEG processing: %s\n", fname );
-
- ok= jpeg_resolution( fname, &w, &h );
-
- if (ok) {
- ULOG_DEBUG("JPEG resolution: %dx%d\n", w, h );
- } else {
- ULOG_DEBUG ("JPEG resolution: failed\n" );
- }
+ ULOG_DEBUG ("processing: %s\n", fname );
+ ok = gdk_pixbuf_get_file_info (fname, &w, &h) != NULL;
+ if (ok) {
+ ULOG_DEBUG("resolution: %dx%d\n", w, h );
+ } else {
+ ULOG_DEBUG ("resolution: failed\n" );
+ w = h = 0;
}
/* Force image height to 26 pixels */
=== modified file 'src/hildon-help.h'
--- a/src/hildon-help.h 2007-03-13 12:44:18 +0000
+++ b/src/hildon-help.h 2007-07-10 13:03:04 +0000
@@ -37,7 +37,7 @@
enum {
HILDON_HELP_SHOW_DIALOG= 0x01,
- HILDON_HELP_SHOW_JUSTASK= 0x02,
+ HILDON_HELP_SHOW_JUSTASK= 0x02
};
/**
=== modified file 'src/osso-helplib.c'
--- a/src/osso-helplib.c 2007-05-29 11:09:54 +0000
+++ b/src/osso-helplib.c 2007-07-22 23:08:55 +0000
@@ -66,10 +66,9 @@
if (cm->message_type == wm_atom && cm->data.l[0] == help_atom) {
/* XClientMessageEvent *cm = xevent; */
g_signal_emit(G_OBJECT(dialog), help_signal, 0);
+
+ return GDK_FILTER_REMOVE; /* Event handled, don't process further */
}
-
- return GDK_FILTER_REMOVE; /* Event handled, don't process
- further */
}
return GDK_FILTER_CONTINUE; /* Event not handled */
More information about the Pkg-maemo-commits
mailing list