From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1LlDId-0006w3-LJ for garchives@archives.gentoo.org; Sun, 22 Mar 2009 02:20:31 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7E445E0682; Sun, 22 Mar 2009 02:20:29 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 3E8C4E0682 for ; Sun, 22 Mar 2009 02:20:29 +0000 (UTC) Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id C789964B36 for ; Sun, 22 Mar 2009 02:20:28 +0000 (UTC) Received: from eva by stork.gentoo.org with local (Exim 4.69) (envelope-from ) id 1LlDIZ-0003AU-R7 for gentoo-commits@lists.gentoo.org; Sun, 22 Mar 2009 02:20:27 +0000 From: "Gilles Dartiguelongue (eva)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, eva@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in app-editors/screem/files: screem-0.16.1-dbus-closing.patch screem-0.16.1-deprecated.patch screem-0.16.1-goption.patch screem-0.16.1-add-tag-file.patch screem-0.16.1-fix-about-dialog.patch X-VCS-Repository: gentoo-x86 X-VCS-Files: screem-0.16.1-dbus-closing.patch screem-0.16.1-deprecated.patch screem-0.16.1-goption.patch screem-0.16.1-add-tag-file.patch screem-0.16.1-fix-about-dialog.patch X-VCS-Directories: app-editors/screem/files X-VCS-Committer: eva X-VCS-Committer-Name: Gilles Dartiguelongue Content-Type: text/plain; charset=utf8 Message-Id: Sender: Gilles Dartiguelongue Date: Sun, 22 Mar 2009 02:20:27 +0000 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 247ba04b-32d0-48e5-ab85-b48edd8cb50f X-Archives-Hash: c5f43938ba0de776d19455544e13474a eva 09/03/22 02:20:27 Added: screem-0.16.1-dbus-closing.patch screem-0.16.1-deprecated.patch screem-0.16.1-goption.patch screem-0.16.1-add-tag-file.patch screem-0.16.1-fix-about-dialog.patch Log: Bump to 0.16.1-r1, * Remove deprecation warnings, bug #127486. * Make add tag file feature work, bug #256611. * About dialog does not close, bug #256803. * Fix error in exit due to old dbus calls, bug #255750. * Port to GOption, fix tests. * Install translations, bug #256611. (Portage version: 2.2_rc25/cvs/Linux x86_64) Revision Changes Path 1.1 app-editors/screem/files/screem-0.16.1-dbus-closing.= patch file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/screem= /files/screem-0.16.1-dbus-closing.patch?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/screem= /files/screem-0.16.1-dbus-closing.patch?rev=3D1.1&content-type=3Dtext/pla= in Index: screem-0.16.1-dbus-closing.patch =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- https://bugs.gentoo.org/show_bug.cgi?id=3D255750 https://sourceforge.net/tracker/index.php?func=3Ddetail&aid=3D2543239&gro= up_id=3D142&atid=3D100142 This removes some obsolete calls to dbus-0.33.0 which were introduced in = 2005, according to the internal ChangeLog of the package. --- a/src/screem-dbus.c 2009-01-18 12:26:29.000000000 +0100 +++ b/src/screem-dbus.c 2009-01-18 21:57:55.000000000 +0100 @@ -129,19 +129,9 @@ =09 #ifdef HAVE_DBUS if( priv->conn ) { -#if DBUS_VERSION > 33000 - dbus_connection_close( priv->conn ); -#else - dbus_connection_disconnect( priv->conn ); -#endif dbus_connection_unref( priv->conn ); } if( priv->sconn ) { -#if DBUS_VERSION > 33000 - dbus_connection_close( priv->sconn ); -#else - dbus_connection_disconnect( priv->sconn ); -#endif dbus_connection_unref( priv->sconn ); } #endif 1.1 app-editors/screem/files/screem-0.16.1-deprecated.pa= tch file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/screem= /files/screem-0.16.1-deprecated.patch?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/screem= /files/screem-0.16.1-deprecated.patch?rev=3D1.1&content-type=3Dtext/plain Index: screem-0.16.1-deprecated.patch =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- http://patches.ubuntu.com/by-release/extracted/ubuntu/s/screem/0.16.1-4.2= ubuntu1/no-disable-deprecated.patch --- a/configure.ac 2007-11-15 09:17:22.000000000 +0100 +++ b/configure.ac 2007-11-15 09:17:31.000000000 +0100 @@ -255,7 +255,7 @@ dnl being the blocker here, need a util function which does the dnl same for utf-8 =20 -DEPRECATION_FLAGS=3D"-DGTK_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED= -DGNOMEUI_DISABLE_DEPRECATED" +DEPRECATION_FLAGS=3D"" =20 CFLAGS=3D"$SCREEM_CFLAGS -Wall $DEPRECATION_FLAGS $CFLAGS" AC_SUBST(CFLAGS) --- a/configure +++ b/configure @@ -26003,7 +26003,7 @@ =20 =20 =20 -DEPRECATION_FLAGS=3D"-DGTK_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED= -DGNOMEUI_DISABLE_DEPRECATED" +DEPRECATION_FLAGS=3D"" =20 CFLAGS=3D"$SCREEM_CFLAGS -Wall $DEPRECATION_FLAGS $CFLAGS" =20 1.1 app-editors/screem/files/screem-0.16.1-goption.patch file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/screem= /files/screem-0.16.1-goption.patch?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/screem= /files/screem-0.16.1-goption.patch?rev=3D1.1&content-type=3Dtext/plain Index: screem-0.16.1-goption.patch =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- Use GOption in place of popt. http://patches.ubuntu.com/by-release/extracted/ubuntu/s/screem/0.16.1-4.2= ubuntu1/switch-to-goption.patch --- a/src/screem-main.c 2005-10-10 20:17:58.000000000 +0100 +++ b/src/screem-main.c 2006-04-24 23:11:08.732661938 +0100 @@ -54,12 +54,23 @@ static gchar *session_filename =3D SESSION_LAST; =20 /* passed parameters stuff */ +#ifndef GNOME_PARAM_GOPTION_CONTEXT static const struct poptOption options[] =3D { { "load-session", 'l', POPT_ARG_STRING, &session_filename, 0, N_("Load the given session file"), N_("FILE") }, { NULL, '\0', 0, NULL, 0, NULL, NULL } }; +#else /* USE GOption interface */ +static const gchar **remaining_args =3D NULL; +static GOptionEntry option_entries[] =3D { + { "load-session", 'l', 0, G_OPTION_ARG_STRING, &(session_filename), + N_("Load the given session file"), N_("FILE") }, + { G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &remaining_ar= gs, + "Special option that collects any remaining arguments for us" }, + { NULL } +}; +#endif =20 typedef enum { MISSING_GLADE, @@ -75,8 +86,10 @@ int main( int argc, char *argv[] ) { GnomeProgram *program; + const gchar** start_files;=09 +#ifndef GNOME_PARAM_GOPTION_CONTEXT poptContext ctx; - const gchar** start_files; +#endif const gchar *icon; =09 gchar *dotdir; @@ -88,11 +101,21 @@ bind_textdomain_codeset( GETTEXT_PACKAGE, "UTF-8" ); textdomain( GETTEXT_PACKAGE ); #endif=09 + +#ifdef GNOME_PARAM_GOPTION_CONTEXT + GOptionContext *option_context =3D g_option_context_new("screem"); + g_option_context_add_main_entries(option_context, option_entries, NULL)= ; +#endif + program =3D gnome_program_init( PACKAGE, VERSION,=20 LIBGNOMEUI_MODULE, argc, argv, GNOME_PROGRAM_STANDARD_PROPERTIES, +#ifndef GNOME_PARAM_GOPTION_CONTEXT GNOME_PARAM_POPT_TABLE, options, +#else + GNOME_PARAM_GOPTION_CONTEXT, option_context, +#endif GNOME_PARAM_APP_DATADIR, DATADIR, LIBGNOMEUI_PARAM_DEFAULT_ICON, DATADIR"/pixmaps/screem.png", @@ -105,10 +128,14 @@ icon =3D DATADIR"/pixmaps/screem.png"; gtk_window_set_default_icon_from_file( icon, NULL ); =20 +#ifndef GNOME_PARAM_GOPTION_CONTEXT /* parse arguments */ g_object_get( G_OBJECT( program ),=20 GNOME_PARAM_POPT_CONTEXT, &ctx, NULL ); start_files =3D parse_args( ctx, argc, argv ); +#else=20 + start_files =3D remaining_args; +#endif =20 gnome_vfs_init(); gnome_authentication_manager_init(); @@ -160,6 +187,7 @@ return FALSE; } =20 +#ifndef GNOME_PARAM_GOPTION_CONTEXT static const gchar **parse_args( poptContext ctx, int argc, char *argv[]= ) { const gchar** start_files; @@ -169,6 +197,7 @@ =20 return start_files; } +#endif =20 static void screem_main_missing( MissingType type ) { 1.1 app-editors/screem/files/screem-0.16.1-add-tag-file.= patch file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/screem= /files/screem-0.16.1-add-tag-file.patch?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/screem= /files/screem-0.16.1-add-tag-file.patch?rev=3D1.1&content-type=3Dtext/pla= in Index: screem-0.16.1-add-tag-file.patch =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- Tag tree feature does not work. https://bugs.gentoo.org/show_bug.cgi?id=3D256611 https://sourceforge.net/support/tracker.php?aid=3D2543273 --- a/src/screem-tagtree.c 2009-01-21 20:00:39.000000000 +0100 +++ b/src/screem-tagtree.c 2009-01-27 15:37:12.000000000 +0100 @@ -673,12 +673,8 @@ G_TYPE_POINTER ); =20 priv->dtdbranch =3D screem_tag_file_new(); + model=3Dpriv->umodel; =20 - model =3D gtk_tree_model_sort_new_with_model( priv->umodel ); - gtk_tree_sortable_set_sort_func( GTK_TREE_SORTABLE( model ), - 0, screem_tag_tree_sort, tree, NULL ); - gtk_tree_sortable_set_sort_column_id( GTK_TREE_SORTABLE( model ), - SCREEM_TAG_FILE_NAME, GTK_SORT_ASCENDING ); priv->sorted =3D model; =20 screem_tag_tree_add_file( tree, priv->dtdbranch, TRUE ); @@ -688,7 +684,6 @@ model ); gdk_threads_leave(); =20 - g_object_unref( model ); =20 return FALSE; } --- a/src/screem-preferences.c 2009-01-27 16:50:33.000000000 +0100 +++ b/src/screem-preferences.c 2009-01-27 17:25:38.000000000 +0100 @@ -1387,7 +1387,8 @@ glade_xml_signal_autoconnect( dxml ); =09 if( gtk_dialog_run( GTK_DIALOG( widget ) ) =3D=3D GTK_RESPONSE_OK ) { - widget =3D glade_xml_get_widget( dxml, "url" ); + widget =3D glade_xml_get_widget( dxml, "open_file_uri" ); + widget =3D GTK_BIN( widget )->child; url =3D gtk_entry_get_text( GTK_ENTRY( widget ) ); =20 found =3D screem_gtk_list_store_find_string( GTK_LIST_STORE( model ), = &it, TAG_FILE_URI_COL, url ); 1.1 app-editors/screem/files/screem-0.16.1-fix-about-dia= log.patch file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/screem= /files/screem-0.16.1-fix-about-dialog.patch?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/screem= /files/screem-0.16.1-fix-about-dialog.patch?rev=3D1.1&content-type=3Dtext= /plain Index: screem-0.16.1-fix-about-dialog.patch =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- The "about" window does not close. https://bugs.gentoo.org/show_bug.cgi?id=3D256803 http://patches.ubuntu.com/by-release/extracted/ubuntu/s/screem/0.16.1-4.2= ubuntu1/fix_help_about_dialog.patch https://sourceforge.net/tracker/index.php?func=3Ddetail&aid=3D1752102&gro= up_id=3D142&atid=3D100142 --- a/src/screem-window-menus.c 2005-11-12 13:56:37.000000000 -0500 +++ b/src/screem-window-menus.c 2008-10-13 09:43:30.000000000 -0400 @@ -3030,6 +3030,9 @@ g_signal_connect_swapped( G_OBJECT( about ), "destroy", G_CALLBACK( g_nullify_pointer ), &about ); + g_signal_connect( G_OBJECT( about ), "response", + G_CALLBACK( gtk_widget_destroy ), + NULL ); } gtk_window_set_transient_for( GTK_WINDOW( about ), GTK_WINDOW( user_data ) );