* [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
@ 2009-03-22 2:20 Gilles Dartiguelongue (eva)
0 siblings, 0 replies; only message in thread
From: Gilles Dartiguelongue (eva) @ 2009-03-22 2:20 UTC (permalink / raw
To: gentoo-commits
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=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/screem/files/screem-0.16.1-dbus-closing.patch?rev=1.1&content-type=text/plain
Index: screem-0.16.1-dbus-closing.patch
===================================================================
---
https://bugs.gentoo.org/show_bug.cgi?id=255750
https://sourceforge.net/tracker/index.php?func=detail&aid=2543239&group_id=142&atid=100142
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 @@
#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.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/screem/files/screem-0.16.1-deprecated.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/screem/files/screem-0.16.1-deprecated.patch?rev=1.1&content-type=text/plain
Index: screem-0.16.1-deprecated.patch
===================================================================
---
http://patches.ubuntu.com/by-release/extracted/ubuntu/s/screem/0.16.1-4.2ubuntu1/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
-DEPRECATION_FLAGS="-DGTK_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DGNOMEUI_DISABLE_DEPRECATED"
+DEPRECATION_FLAGS=""
CFLAGS="$SCREEM_CFLAGS -Wall $DEPRECATION_FLAGS $CFLAGS"
AC_SUBST(CFLAGS)
--- a/configure
+++ b/configure
@@ -26003,7 +26003,7 @@
-DEPRECATION_FLAGS="-DGTK_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DGNOMEUI_DISABLE_DEPRECATED"
+DEPRECATION_FLAGS=""
CFLAGS="$SCREEM_CFLAGS -Wall $DEPRECATION_FLAGS $CFLAGS"
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=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/screem/files/screem-0.16.1-goption.patch?rev=1.1&content-type=text/plain
Index: screem-0.16.1-goption.patch
===================================================================
---
Use GOption in place of popt.
http://patches.ubuntu.com/by-release/extracted/ubuntu/s/screem/0.16.1-4.2ubuntu1/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 = SESSION_LAST;
/* passed parameters stuff */
+#ifndef GNOME_PARAM_GOPTION_CONTEXT
static const struct poptOption options[] = {
{ "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 = NULL;
+static GOptionEntry option_entries[] = {
+ { "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_args,
+ "Special option that collects any remaining arguments for us" },
+ { NULL }
+};
+#endif
typedef enum {
MISSING_GLADE,
@@ -75,8 +86,10 @@
int main( int argc, char *argv[] )
{
GnomeProgram *program;
+ const gchar** start_files;
+#ifndef GNOME_PARAM_GOPTION_CONTEXT
poptContext ctx;
- const gchar** start_files;
+#endif
const gchar *icon;
gchar *dotdir;
@@ -88,11 +101,21 @@
bind_textdomain_codeset( GETTEXT_PACKAGE, "UTF-8" );
textdomain( GETTEXT_PACKAGE );
#endif
+
+#ifdef GNOME_PARAM_GOPTION_CONTEXT
+ GOptionContext *option_context = g_option_context_new("screem");
+ g_option_context_add_main_entries(option_context, option_entries, NULL);
+#endif
+
program = gnome_program_init( PACKAGE, VERSION,
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 = DATADIR"/pixmaps/screem.png";
gtk_window_set_default_icon_from_file( icon, NULL );
+#ifndef GNOME_PARAM_GOPTION_CONTEXT
/* parse arguments */
g_object_get( G_OBJECT( program ),
GNOME_PARAM_POPT_CONTEXT, &ctx, NULL );
start_files = parse_args( ctx, argc, argv );
+#else
+ start_files = remaining_args;
+#endif
gnome_vfs_init();
gnome_authentication_manager_init();
@@ -160,6 +187,7 @@
return FALSE;
}
+#ifndef GNOME_PARAM_GOPTION_CONTEXT
static const gchar **parse_args( poptContext ctx, int argc, char *argv[] )
{
const gchar** start_files;
@@ -169,6 +197,7 @@
return start_files;
}
+#endif
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=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/screem/files/screem-0.16.1-add-tag-file.patch?rev=1.1&content-type=text/plain
Index: screem-0.16.1-add-tag-file.patch
===================================================================
---
Tag tree feature does not work.
https://bugs.gentoo.org/show_bug.cgi?id=256611
https://sourceforge.net/support/tracker.php?aid=2543273
--- 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 );
priv->dtdbranch = screem_tag_file_new();
+ model=priv->umodel;
- model = 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 = model;
screem_tag_tree_add_file( tree, priv->dtdbranch, TRUE );
@@ -688,7 +684,6 @@
model );
gdk_threads_leave();
- g_object_unref( model );
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 );
if( gtk_dialog_run( GTK_DIALOG( widget ) ) == GTK_RESPONSE_OK ) {
- widget = glade_xml_get_widget( dxml, "url" );
+ widget = glade_xml_get_widget( dxml, "open_file_uri" );
+ widget = GTK_BIN( widget )->child;
url = gtk_entry_get_text( GTK_ENTRY( widget ) );
found = 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-dialog.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/screem/files/screem-0.16.1-fix-about-dialog.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/screem/files/screem-0.16.1-fix-about-dialog.patch?rev=1.1&content-type=text/plain
Index: screem-0.16.1-fix-about-dialog.patch
===================================================================
---
The "about" window does not close.
https://bugs.gentoo.org/show_bug.cgi?id=256803
http://patches.ubuntu.com/by-release/extracted/ubuntu/s/screem/0.16.1-4.2ubuntu1/fix_help_about_dialog.patch
https://sourceforge.net/tracker/index.php?func=detail&aid=1752102&group_id=142&atid=100142
--- 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 ) );
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2009-03-22 2:20 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-03-22 2:20 [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 Gilles Dartiguelongue (eva)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox