libgnome r3887 - in trunk: . libgnome monikers
- From: kmaraas svn gnome org
- To: svn-commits-list gnome org
- Subject: libgnome r3887 - in trunk: . libgnome monikers
- Date: Fri, 6 Mar 2009 13:36:27 +0000 (UTC)
Author: kmaraas
Date: Fri Mar 6 13:36:27 2009
New Revision: 3887
URL: http://svn.gnome.org/viewvc/libgnome?rev=3887&view=rev
Log:
2009-03-06 Kjartan Maraas <kmaraas gnome org>
* libgnome/gnome-config.c: (load):
* libgnome/gnome-triggers.c:
* libgnome/gnome-url.c: (gnome_url_show_with_env):
* monikers/bonobo-config-bag.c: (impl_Bonobo_PropertyBag_getKeys),
(impl_Bonobo_PropertyBag_getType),
(impl_Bonobo_PropertyBag_getValue),
(impl_Bonobo_PropertyBag_setValue),
(impl_Bonobo_PropertyBag_getValues),
(impl_Bonobo_PropertyBag_getDefault),
(impl_Bonobo_PropertyBag_getDocTitle),
(impl_Bonobo_PropertyBag_getDoc),
(impl_Bonobo_PropertyBag_getFlags):
- Remove #if 0'ed out code.
- Fix warnings about missing format specifiers.
Modified:
trunk/ChangeLog
trunk/NEWS
trunk/configure.in
trunk/libgnome/gnome-config.c
trunk/libgnome/gnome-triggers.c
trunk/libgnome/gnome-url.c
trunk/monikers/bonobo-config-bag.c
Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS (original)
+++ trunk/NEWS Fri Mar 6 13:36:27 2009
@@ -1,3 +1,8 @@
+libgnome 2.24.1
+
+* Fix warnings about missing format specifiers (Kjartan)
+* Remove #if 0'ed out code (Kjartan)
+
libgnome 2.24.0.1
* Make thumbnail housekeeping less agressive by default
Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in (original)
+++ trunk/configure.in Fri Mar 6 13:36:27 2009
@@ -8,7 +8,7 @@
# set LIBGNOME_BINARY_AGE and LIBGNOME_INTERFACE_AGE to 0.
#
m4_define([libgnome_major_version], [2])
-m4_define([libgnome_minor_version], [24])
+m4_define([libgnome_minor_version], [25])
m4_define([libgnome_micro_version], [1])
m4_define([libgnome_interface_age], [1])
# If you need a modifier for the version number.
Modified: trunk/libgnome/gnome-config.c
==============================================================================
--- trunk/libgnome/gnome-config.c (original)
+++ trunk/libgnome/gnome-config.c Fri Mar 6 13:36:27 2009
@@ -403,8 +403,6 @@
SecHeader->keys->value = decode_string_and_dup (CharBuffer);
state = c == '\n' ? KeyDef : IgnoreToEOL;
next = CharBuffer;
-#ifdef GNOME_ENABLE_DEBUG
-#endif
} else
*next++ = c;
break;
Modified: trunk/libgnome/gnome-triggers.c
==============================================================================
--- trunk/libgnome/gnome-triggers.c (original)
+++ trunk/libgnome/gnome-triggers.c Fri Mar 6 13:36:27 2009
@@ -84,165 +84,6 @@
};
/* IMPLEMENTATIONS */
-#if 0
-void
-gnome_triggers_init(void)
-{
-}
-#endif
-
-#if 0
-/* snarfed almost directly from sound-properties. */
-static gint
-gnome_triggers_read_path(const char *config_path)
-{
- GDir *dir;
- char *sample_name, *sample_file, *ctmp;
- gpointer event_iter;
- const gchar *dent;
- GnomeTrigger nt;
- GString *tmpstr;
-
- nt.type = GTRIG_MEDIAPLAY;
- nt.level = NULL;
- nt.u.media.cache_id = -1;
-
- dir = g_dir_open(config_path, 0, NULL);
- if(!dir)
- return -1;
-
- tmpstr = g_string_new(NULL);
-
- while((dent = g_dir_read_name(dir))) {
- /* ignore no-good dir entries.
- We ignore "gnome" because the system sounds are listed in there.
- */
- if (!strcmp(dent, ".")
- || !strcmp(dent, "..")
- || !strcmp(dent, "gnome")
- || !strcmp(dent, "gnome.soundlist"))
- continue;
-
- g_string_printf(tmpstr, "=%s/%s=", config_path, dent);
-
- gnome_config_push_prefix(tmpstr->str);
-
- event_iter = gnome_config_init_iterator_sections(tmpstr->str);
- while((event_iter = gnome_config_iterator_next(event_iter,
- &sample_name, NULL))) {
- if(!strcmp(sample_name, "__section_info__"))
- goto continue_loop;
-
- g_string_printf(tmpstr, "%s/file", sample_name);
- sample_file = gnome_config_get_string(tmpstr->str);
-
- if(!sample_file || !*sample_file) {
- g_free(sample_name);
- continue;
- }
-
- if(*sample_file != '/') {
- char *tmp = gnome_sound_file(sample_file);
- g_free(sample_file);
- sample_file = tmp;
- }
-
- ctmp = g_strdup(dent);
- if(strstr(ctmp, ".soundlist"))
- *strstr(ctmp, ".soundlist") = '\0';
-
- nt.u.media.file = sample_file;
- gnome_triggers_add_trigger(&nt, ctmp, sample_name, NULL);
- g_print ("Added: %s\n", ctmp);
-
- g_free(ctmp);
-
- continue_loop:
- g_free(sample_name);
- }
-
- gnome_config_pop_prefix();
- }
- g_dir_close(dirh);
-
- g_string_free(tmpstr, TRUE);
-
- return 0;
-}
-/**
- * gnome_triggers_readfile:
- * @infilename: A file listing triggers to install in the currently
- * running program.
- *
- * The file should be of the format:
- *
- * level section type params
- *
- * Where 'level' indicates the message severity at which this trigger
- * should be activated, 'section' is a colon-separated list indicating
- * which part of the "message classification tree" this trigger will
- * be activated for, 'type' is either "command" (run the command
- * specified in 'params') or 'play' (play the esd sound sample named
- * 'params').
- *
- * Returns 0 on success. 1 otherwise.
- *
- */
-static gint
-gnome_triggers_readfile(const char *infilename)
-{
- GnomeTrigger* nt;
- char aline[512];
- char **subnames = NULL;
- char **parts = NULL;
- FILE *infile;
- int i;
-
- infile = g_fopen(infilename, "r");
- if(infile == NULL)
- return 1;
-
- nt = gnome_trigger_dup(NULL);
- while(fgets(aline, sizeof(aline), infile)) {
- i = strlen(aline) - 1;
- while(isspace(aline[i])) aline[i--] = '\0';
-
- if(aline[0] == '\0' || aline[0] == '#')
- continue;
-
- parts = g_strsplit(aline, " ", 4);
- if(!parts || !parts[0] || !parts[1] || !parts[2] || !parts[3]) {
- g_strfreev(parts);
- g_warning("Invalid triggers line \'%s\'\n", aline);
- continue;
- }
-
- if(!strcmp(parts[1], "NULL")) {
- subnames = g_malloc(sizeof(gchar *));
- subnames[0] = NULL;
- } else
- subnames = g_strsplit(parts[1], ":", -1);
-
- if(!strcmp(parts[2], "command"))
- nt->type = GTRIG_COMMAND;
- else if(!strcmp(parts[2], "play"))
- nt->type = GTRIG_MEDIAPLAY;
- nt->u.command = parts[3];
- if(!strcmp(parts[0], "NULL"))
- nt->level = NULL;
- else
- nt->level = parts[0];
- gnome_triggers_vadd_trigger(nt, subnames);
-
- g_strfreev(subnames);
- g_strfreev(parts);
- }
- g_free(nt);
- fclose(infile);
-
- return 0;
-}
-#endif
/**
* gnome_triggers_add_trigger:
Modified: trunk/libgnome/gnome-url.c
==============================================================================
--- trunk/libgnome/gnome-url.c (original)
+++ trunk/libgnome/gnome-url.c Fri Mar 6 13:36:27 2009
@@ -163,10 +163,10 @@
_("The login has failed."));
break;
default:
- g_set_error (error,
- GNOME_URL_ERROR,
- GNOME_URL_ERROR_VFS,
- gnome_vfs_result_to_string (result));
+ g_set_error_literal (error,
+ GNOME_URL_ERROR,
+ GNOME_URL_ERROR_VFS,
+ gnome_vfs_result_to_string (result));
}
return FALSE;
Modified: trunk/monikers/bonobo-config-bag.c
==============================================================================
--- trunk/monikers/bonobo-config-bag.c (original)
+++ trunk/monikers/bonobo-config-bag.c Fri Mar 6 13:36:27 2009
@@ -60,7 +60,7 @@
slist = gconf_client_all_entries (cb->conf_client, path, &err);
g_free (path);
if (err) {
- bonobo_exception_general_error_set (ev, NULL, err->message);
+ bonobo_exception_general_error_set (ev, NULL, "%s", err->message);
g_error_free (err);
return CORBA_OBJECT_NIL;
}
@@ -106,7 +106,7 @@
value = gconf_client_get (cb->conf_client, path, &err);
g_free (path);
if (err) {
- bonobo_exception_general_error_set (ev, NULL, err->message);
+ bonobo_exception_general_error_set (ev, NULL, "%s", err->message);
g_error_free (err);
return CORBA_OBJECT_NIL;
}
@@ -179,7 +179,7 @@
value = gconf_client_get (cb->conf_client, path, &err);
g_free (path);
if (err) {
- bonobo_exception_general_error_set (ev, NULL, err->message);
+ bonobo_exception_general_error_set (ev, NULL, "%s", err->message);
g_error_free (err);
return CORBA_OBJECT_NIL;
}
@@ -235,7 +235,7 @@
g_free (path);
if (err) {
- bonobo_exception_general_error_set (ev, NULL, err->message);
+ bonobo_exception_general_error_set (ev, NULL, "%s", err->message);
g_error_free (err);
}
}
@@ -264,7 +264,7 @@
slist = gconf_client_all_entries (cb->conf_client, path, &err);
g_free (path);
if (err) {
- bonobo_exception_general_error_set (ev, NULL, err->message);
+ bonobo_exception_general_error_set (ev, NULL, "%s", err->message);
g_error_free (err);
return CORBA_OBJECT_NIL;
}
@@ -331,7 +331,7 @@
value = gconf_client_get_default_from_schema (cb->conf_client, path, &err);
g_free (path);
if (err) {
- bonobo_exception_general_error_set (ev, NULL, err->message);
+ bonobo_exception_general_error_set (ev, NULL, "%s", err->message);
g_error_free (err);
return CORBA_OBJECT_NIL;
}
@@ -359,7 +359,7 @@
schema = gconf_client_get_schema (cb->conf_client, path, &err);
g_free (path);
if (err) {
- bonobo_exception_general_error_set (ev, NULL, err->message);
+ bonobo_exception_general_error_set (ev, NULL, "%s", err->message);
g_error_free (err);
return NULL;
}
@@ -392,7 +392,7 @@
schema = gconf_client_get_schema (cb->conf_client, path, &err);
g_free (path);
if (err) {
- bonobo_exception_general_error_set (ev, NULL, err->message);
+ bonobo_exception_general_error_set (ev, NULL, "%s", err->message);
g_error_free (err);
return NULL;
}
@@ -424,7 +424,7 @@
entry = gconf_client_get_entry (cb->conf_client, path, NULL, TRUE, &err);
g_free (path);
if (err) {
- bonobo_exception_general_error_set (ev, NULL, err->message);
+ bonobo_exception_general_error_set (ev, NULL, "%s", err->message);
g_error_free (err);
return 0;
}
@@ -438,27 +438,6 @@
return retval;
}
-#if 0
-static void
-notify_cb (BonoboListener *listener,
- const char *event_name,
- const CORBA_any *any,
- CORBA_Environment *ev,
- gpointer user_data)
-{
- BonoboConfigBag *cb = BONOBO_CONFIG_BAG (user_data);
- char *tmp, *ename;
-
- tmp = bonobo_event_subtype (event_name);
- ename = g_strconcat ("Bonobo/Property:change:", tmp, NULL);
- g_free (tmp);
-
- bonobo_event_source_notify_listeners (cb->es, ename, any, NULL);
-
- g_free (ename);
-}
-#endif
-
BonoboConfigBag *
bonobo_config_bag_new (const gchar *path)
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]