rpms/screem/devel fix_miscompile.patch,NONE,1.1 .cvsignore,1.4,1.5
Michael J Knox (mjk)
fedora-extras-commits at redhat.com
Tue Apr 25 01:48:24 UTC 2006
- Previous message (by thread): rpms/screem/devel sources,1.4,1.5
- Next message (by thread): rpms/screem/FC-5 fix_miscompile.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 screem.spec, 1.6, 1.7 sources, 1.4, 1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mjk
Update of /cvs/extras/rpms/screem/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3193
Modified Files:
.cvsignore
Added Files:
fix_miscompile.patch
Log Message:
patch to fix miscompile
fix_miscompile.patch:
--- NEW FILE fix_miscompile.patch ---
--- screem-0.16.1/src/screem-main.c.orig 2006-04-25 13:02:00.000000000 +1200
+++ screem-0.16.1/src/screem-main.c 2006-04-25 13:06:58.000000000 +1200
@@ -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;
@@ -87,12 +100,22 @@
bindtextdomain( GETTEXT_PACKAGE, GNOMELOCALEDIR );
bind_textdomain_codeset( GETTEXT_PACKAGE, "UTF-8" );
textdomain( GETTEXT_PACKAGE );
-#endif
+#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 )
{
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/screem/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 7 Jul 2005 20:57:33 -0000 1.4
+++ .cvsignore 25 Apr 2006 01:48:24 -0000 1.5
@@ -1 +1 @@
-screem-0.14.1.tar.gz
+screem-0.16.1.tar.gz
- Previous message (by thread): rpms/screem/devel sources,1.4,1.5
- Next message (by thread): rpms/screem/FC-5 fix_miscompile.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 screem.spec, 1.6, 1.7 sources, 1.4, 1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list