projects
/
platform
/
upstream
/
glib.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ad09498
)
Shorten a variable name
author
Matthias Clasen
<mclasen@redhat.com>
Tue, 29 Nov 2011 01:37:07 +0000
(20:37 -0500)
committer
Ryan Lortie
<desrt@desrt.ca>
Thu, 8 Dec 2011 23:05:13 +0000
(18:05 -0500)
gio/gmenuexporter.c
patch
|
blob
|
history
diff --git
a/gio/gmenuexporter.c
b/gio/gmenuexporter.c
index
6d9df45
..
87e2ca3
100644
(file)
--- a/
gio/gmenuexporter.c
+++ b/
gio/gmenuexporter.c
@@
-857,7
+857,7
@@
g_menu_exporter_new (GDBusConnection *connection,
/* {{{1 Public API */
/* {{{1 Public API */
-static GHashTable *
g_menu_exporter_
exported_menus;
+static GHashTable *exported_menus;
/**
* g_menu_model_dbus_export_start:
/**
* g_menu_model_dbus_export_start:
@@
-891,12
+891,13
@@
g_menu_model_dbus_export_start (GDBusConnection *connection,
{
GMenuExporter *exporter;
{
GMenuExporter *exporter;
- if G_UNLIKELY (
g_menu_exporter_
exported_menus == NULL)
-
g_menu_exporter_
exported_menus = g_hash_table_new (NULL, NULL);
+ if G_UNLIKELY (exported_menus == NULL)
+ exported_menus = g_hash_table_new (NULL, NULL);
- if G_UNLIKELY (g_hash_table_lookup (
g_menu_exporter_
exported_menus, menu))
+ if G_UNLIKELY (g_hash_table_lookup (exported_menus, menu))
{
{
- g_set_error (error, G_DBUS_ERROR, G_DBUS_ERROR_FILE_EXISTS, "The given GMenuModel has already been exported");
+ g_set_error (error, G_DBUS_ERROR, G_DBUS_ERROR_FILE_EXISTS,
+ "The given GMenuModel has already been exported");
return FALSE;
}
return FALSE;
}
@@
-905,7
+906,7
@@
g_menu_model_dbus_export_start (GDBusConnection *connection,
if (exporter == NULL)
return FALSE;
if (exporter == NULL)
return FALSE;
- g_hash_table_insert (
g_menu_exporter_
exported_menus, menu, exporter);
+ g_hash_table_insert (exported_menus, menu, exporter);
return TRUE;
}
return TRUE;
}
@@
-927,14
+928,14
@@
g_menu_model_dbus_export_stop (GMenuModel *menu)
{
GMenuExporter *exporter;
{
GMenuExporter *exporter;
- if G_UNLIKELY (
g_menu_exporter_
exported_menus == NULL)
+ if G_UNLIKELY (exported_menus == NULL)
return FALSE;
return FALSE;
- exporter = g_hash_table_lookup (
g_menu_exporter_
exported_menus, menu);
+ exporter = g_hash_table_lookup (exported_menus, menu);
if G_UNLIKELY (exporter == NULL)
return FALSE;
if G_UNLIKELY (exporter == NULL)
return FALSE;
- g_hash_table_remove (
g_menu_exporter_
exported_menus, menu);
+ g_hash_table_remove (exported_menus, menu);
g_menu_exporter_free (exporter);
return TRUE;
g_menu_exporter_free (exporter);
return TRUE;
@@
-965,10
+966,10
@@
g_menu_model_dbus_export_query (GMenuModel *menu,
{
GMenuExporter *exporter;
{
GMenuExporter *exporter;
- if (
g_menu_exporter_
exported_menus == NULL)
+ if (exported_menus == NULL)
return FALSE;
return FALSE;
- exporter = g_hash_table_lookup (
g_menu_exporter_
exported_menus, menu);
+ exporter = g_hash_table_lookup (exported_menus, menu);
if (exporter == NULL)
return FALSE;
if (exporter == NULL)
return FALSE;