Commit 95ae615a authored by Jim Krehl's avatar Jim Krehl
Browse files

svn path=/branches/version-2/; revision=144



svn path=/branches/version-2/; revision=144
parent e7265b5a
......@@ -85,7 +85,6 @@ static void handle_launcher_single_clicked (Tile * launcher, gpointer data);
static void handle_menu_action_performed (Tile * launcher, TileEvent * event, TileAction * action,
gpointer data);
static gint category_name_compare (gconstpointer a, gconstpointer b);
static gint category_data_compare (gconstpointer a, gconstpointer b);
static gint application_launcher_compare (gconstpointer a, gconstpointer b);
static void gmenu_tree_changed_callback (GMenuTree * tree, gpointer user_data);
gboolean regenerate_categories (AppShellData * app_data);
......@@ -1274,19 +1273,6 @@ category_name_compare (gconstpointer a, gconstpointer b)
return g_ascii_strcasecmp (category, data->category);
}
static gint
category_data_compare (gconstpointer a, gconstpointer b)
{
CategoryData *data1 = (CategoryData *) a;
CategoryData *data2 = (CategoryData *) b;
if (data1->category == NULL || data2->category == NULL)
{
g_assert_not_reached ();
}
return g_ascii_strcasecmp (data1->category, data2->category);
}
static void
tile_activated_cb (Tile * tile, TileEvent * event, gpointer user_data)
{
......
......@@ -621,7 +621,7 @@ send_to_trigger (Tile *tile, TileEvent *event, TileAction *action)
G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, &error);
if (error)
handle_g_error (&error, "error in %s", __FUNCTION__);
handle_g_error (&error, "error in %s", G_STRFUNC);
g_free (cmd);
g_free (filename);
......
......@@ -869,7 +869,7 @@ send_to_trigger (Tile *tile, TileEvent *event, TileAction *action)
G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, &error);
if (error)
handle_g_error (&error, "error in %s", __FUNCTION__);
handle_g_error (&error, "error in %s", G_STRFUNC);
g_free (cmd);
g_free (filename);
......
......@@ -129,7 +129,7 @@ get_gconf_value (const gchar * key)
if (error || ! value)
{
handle_g_error (&error, "%s: error getting %s", __FUNCTION__, key);
handle_g_error (&error, "%s: error getting %s", G_STRFUNC, key);
goto exit;
}
......@@ -204,7 +204,7 @@ set_gconf_value (const gchar * key, gconstpointer data)
if (error)
{
handle_g_error (&error, "%s: error getting %s", __FUNCTION__, key);
handle_g_error (&error, "%s: error getting %s", G_STRFUNC, key);
goto exit;
}
......@@ -261,7 +261,7 @@ set_gconf_value (const gchar * key, gconstpointer data)
gconf_client_set (client, key, value, &error);
if (error)
handle_g_error (&error, "%s: error setting %s", __FUNCTION__, key);
handle_g_error (&error, "%s: error setting %s", G_STRFUNC, key);
exit:
......@@ -281,7 +281,7 @@ connect_gconf_notify (const gchar * key, GConfClientNotifyFunc cb, gpointer user
conn_id = gconf_client_notify_add (client, key, cb, user_data, NULL, &error);
if (error)
handle_g_error (&error, "%s: error adding notify for (%s)", __FUNCTION__, key);
handle_g_error (&error, "%s: error adding notify for (%s)", G_STRFUNC, key);
g_object_unref (client);
......
......@@ -308,7 +308,7 @@ libslab_get_gconf_value (const gchar *key)
value = gconf_client_get (client, key, & error);
if (error || ! value)
libslab_handle_g_error (& error, "%s: error getting %s", G_GNUC_FUNCTION, key);
libslab_handle_g_error (& error, "%s: error getting %s", G_STRFUNC, key);
else {
switch (value->type) {
case GCONF_VALUE_STRING:
......@@ -378,7 +378,7 @@ libslab_set_gconf_value (const gchar *key, gconstpointer data)
value = gconf_client_get (client, key, & error);
if (error) {
libslab_handle_g_error (&error, "%s: error getting %s", G_GNUC_FUNCTION, key);
libslab_handle_g_error (&error, "%s: error getting %s", G_STRFUNC, key);
goto exit;
}
......@@ -431,7 +431,7 @@ libslab_set_gconf_value (const gchar *key, gconstpointer data)
gconf_client_set (client, key, value, & error);
if (error)
libslab_handle_g_error (&error, "%s: error setting %s", G_GNUC_FUNCTION, key);
libslab_handle_g_error (&error, "%s: error setting %s", G_STRFUNC, key);
exit:
......@@ -453,7 +453,7 @@ libslab_gconf_notify_add (const gchar *key, GConfClientNotifyFunc callback, gpoi
if (error)
libslab_handle_g_error (
& error, "%s: error adding gconf notify for (%s)", __FUNCTION__, key);
& error, "%s: error adding gconf notify for (%s)", G_STRFUNC, key);
g_object_unref (client);
......@@ -476,7 +476,7 @@ libslab_gconf_notify_remove (guint conn_id)
if (error)
libslab_handle_g_error (
& error, "%s: error removing gconf notify", __FUNCTION__);
& error, "%s: error removing gconf notify", G_STRFUNC);
g_object_unref (client);
}
......@@ -628,9 +628,7 @@ get_uri_list (const gchar *path)
}
else
libslab_handle_g_error (
& error,
"%s: couldn't load bookmark file [%s]",
G_GNUC_FUNCTION, path);
& error, "%s: couldn't load bookmark file [%s]", G_STRFUNC, path);
g_strfreev (uris_array);
......@@ -719,13 +717,13 @@ remove_bookmark_item (const gchar *path_old, const gchar *path_new, const gchar
libslab_handle_g_error (
& error,
"%s: couldn't save bookmark file [%s]",
__FUNCTION__, path_new);
G_STRFUNC, path_new);
}
else
libslab_handle_g_error (
& error,
"%s: couldn't open bookmark file [%s]",
__FUNCTION__, path_old);
G_STRFUNC, path_old);
libslab_bookmark_file_free (bm_file);
}
......@@ -759,13 +757,13 @@ libslab_add_user_doc (const gchar *uri, const gchar *mime_type, time_t modified,
libslab_handle_g_error (
& error,
"%s: couldn't save bookmark file [%s]",
__FUNCTION__, path_new);
G_STRFUNC, path_new);
}
else
libslab_handle_g_error (
& error,
"%s: couldn't open bookmark file [%s]",
__FUNCTION__, path_old);
G_STRFUNC, path_old);
libslab_bookmark_file_free (bm_file);
}
......@@ -837,7 +835,7 @@ store_has_uri (const gchar *path, const gchar *uri)
libslab_handle_g_error (
& error,
"%s: couldn't open bookmark file [%s]",
__FUNCTION__, path);
G_STRFUNC, path);
libslab_bookmark_file_free (bm_file);
......@@ -890,7 +888,7 @@ save_uri_list (const gchar *filename, const GList *uris)
if (error)
libslab_handle_g_error (
& error, "%s: cannot save uri list [%s]",
G_GNUC_FUNCTION, path);
G_STRFUNC, path);
#ifdef USE_G_BOOKMARK
g_bookmark_file_free (bm_file);
......
......@@ -169,7 +169,7 @@ nameplate_tile_set_property (GObject * g_object, guint prop_id, const GValue * v
break;
case PROP_NAMEPLATE_TOOLTIP:
tooltip = g_value_get_string (value);
tooltip = g_value_dup_string (value);
break;
default:
......
......@@ -117,7 +117,7 @@ bookmark_tile_table_update (TileTable *this, TileTableUpdateEvent *event)
libslab_handle_g_error (
& error,
"%s: couldn't save bookmark file [%s]",
__FUNCTION__, path_new);
G_STRFUNC, path_new);
libslab_bookmark_file_free (bm_file_old);
libslab_bookmark_file_free (bm_file_new);
......@@ -153,13 +153,13 @@ bookmark_tile_table_uri_added (TileTable *this, TileTableURIAddedEvent *event)
libslab_handle_g_error (
& error,
"%s: couldn't save bookmark file [%s]",
__FUNCTION__, path_new);
G_STRFUNC, path_new);
}
else if (error)
libslab_handle_g_error (
& error,
"%s: couldn't open bookmark file [%s]",
__FUNCTION__, path_old);
G_STRFUNC, path_old);
else
/* do nothing */ ;
......@@ -208,7 +208,7 @@ reload_tiles (TileTable *this)
libslab_handle_g_error (
& error,
"%s: couldn't load bookmark file [%s]",
__FUNCTION__, path);
G_STRFUNC, path);
libslab_bookmark_file_free (bm_file);
g_list_free (tiles);
......
......@@ -110,14 +110,14 @@ migrate_system_gconf_to_bookmark_file ()
if (error)
libslab_handle_g_error (
& error, "%s: can't read system item store path [%s]\n",
__FUNCTION__, bookmark_path);
G_STRFUNC, bookmark_path);
else
g_file_set_contents (bookmark_path_cp_dest, contents, -1, & error);
if (error)
libslab_handle_g_error (
& error, "%s: can't save system item store path [%s]\n",
__FUNCTION__, bookmark_path_cp_dest);
G_STRFUNC, bookmark_path_cp_dest);
g_free (contents);
g_free (bookmark_path_cp_dest);
......@@ -251,7 +251,7 @@ migrate_system_gconf_to_bookmark_file ()
libslab_handle_g_error (
& error,
"%s: cannot save migrated system item list [%s]",
G_GNUC_FUNCTION, bookmark_path);
G_STRFUNC, bookmark_path);
libslab_bookmark_file_free (bm_file);
......@@ -306,14 +306,14 @@ migrate_user_apps_gconf_to_bookmark_file ()
if (error)
libslab_handle_g_error (
& error, "%s: can't read user apps store path [%s]\n",
__FUNCTION__, bookmark_path);
G_STRFUNC, bookmark_path);
else
g_file_set_contents (bookmark_path_cp_dest, contents, -1, & error);
if (error)
libslab_handle_g_error (
& error, "%s: can't save user apps store path [%s]\n",
__FUNCTION__, bookmark_path_cp_dest);
G_STRFUNC, bookmark_path_cp_dest);
g_free (contents);
g_free (bookmark_path_cp_dest);
......@@ -373,7 +373,7 @@ migrate_user_apps_gconf_to_bookmark_file ()
libslab_handle_g_error (
& error,
"%s: cannot save migrated user apps list [%s]",
G_GNUC_FUNCTION, bookmark_path);
G_STRFUNC, bookmark_path);
#ifdef USE_G_BOOKMARK
g_bookmark_file_free (bm_file);
......@@ -410,14 +410,14 @@ migrate_user_docs_to_user_bookmark_file ()
if (error)
libslab_handle_g_error (
& error, "%s: can't read user docs store path [%s]\n",
__FUNCTION__, bookmark_path);
G_STRFUNC, bookmark_path);
else
g_file_set_contents (bookmark_path_cp_dest, contents, -1, & error);
if (error)
libslab_handle_g_error (
& error, "%s: can't save user docs store path [%s]\n",
__FUNCTION__, bookmark_path_cp_dest);
G_STRFUNC, bookmark_path_cp_dest);
g_free (contents);
g_free (bookmark_path_cp_dest);
......@@ -448,14 +448,14 @@ migrate_user_dirs_to_user_bookmark_file ()
if (error)
libslab_handle_g_error (
& error, "%s: can't read user dirs store path [%s]\n",
__FUNCTION__, bookmark_path);
G_STRFUNC, bookmark_path);
else
g_file_set_contents (bookmark_path_cp_dest, contents, -1, & error);
if (error)
libslab_handle_g_error (
& error, "%s: can't save user dirs store path [%s]\n",
__FUNCTION__, bookmark_path_cp_dest);
G_STRFUNC, bookmark_path_cp_dest);
g_free (contents);
g_free (bookmark_path_cp_dest);
......
......@@ -924,7 +924,7 @@ launch_search (MainMenuUI *this)
if (error) {
cmd = g_strjoinv (" ", argv);
libslab_handle_g_error (
& error, "%s: can't execute search [%s]\n", __FUNCTION__, cmd);
& error, "%s: can't execute search [%s]\n", G_STRFUNC, cmd);
g_free (cmd);
}
......
......@@ -130,7 +130,7 @@ init_nm_connection (NetworkStatusAgent * agent)
if (!priv->nm_conn)
{
handle_g_error (&error, "%s: dbus_g_bus_get () failed", __FUNCTION__);
handle_g_error (&error, "%s: dbus_g_bus_get () failed", G_STRFUNC);
agent->nm_present = FALSE;
......@@ -220,7 +220,7 @@ nm_get_devices (NetworkStatusAgent * agent)
if (error)
{
handle_g_error (&error, "%s: calling \"getDevices\" failed", __FUNCTION__);
handle_g_error (&error, "%s: calling \"getDevices\" failed", G_STRFUNC);
return NULL;
}
......@@ -276,7 +276,7 @@ nm_get_device_info (NetworkStatusAgent * agent, DBusGProxy * device)
if (error)
{
handle_g_error (&error, "%s: calling \"getProperties\" (A) failed", __FUNCTION__);
handle_g_error (&error, "%s: calling \"getProperties\" (A) failed", G_STRFUNC);
g_free (network_path);
g_object_unref (info);
......@@ -290,7 +290,7 @@ nm_get_device_info (NetworkStatusAgent * agent, DBusGProxy * device)
&info->driver, G_TYPE_INVALID);
if (error)
handle_g_error (&error, "%s: calling \"getDriver\" failed", __FUNCTION__);
handle_g_error (&error, "%s: calling \"getDriver\" failed", G_STRFUNC);
if (info->type == DEVICE_TYPE_802_11_WIRELESS
&& string_is_valid_dbus_path (network_path))
......@@ -313,7 +313,7 @@ nm_get_device_info (NetworkStatusAgent * agent, DBusGProxy * device)
if (error)
handle_g_error (&error, "%s: calling \"getProperties\" (B) failed",
__FUNCTION__);
G_STRFUNC);
}
g_free (network_path);
......
......@@ -234,7 +234,7 @@ sync_gtk_bookmarks_to_store (UserDirsTileTable *this)
libslab_handle_g_error (
& error,
"%s: couldn't save bookmark file [%s]",
__FUNCTION__, path);
G_STRFUNC, path);
g_strfreev (folders);
g_free (buf);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment