mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2025-03-03 18:25:35 +00:00
Code Issues Releases Wiki Activity

use G_DEFINE_QUARK instead of rolling our own quark getters

Browse source
This commit is contained in:
Jordan Lee 2013-07-09 22:44:24 +00:00
parent de248c94fb
commit d244545979
3 changed files with 8 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
gtk/tr-icon.c
View file

@ -21,16 +21,7 @@
#include "tr-icon.h" #include "tr-icon.h"
#include "util.h" #include "util.h"
static GQuark static G_DEFINE_QUARK (tr-core, core)
get_core_quark (void)
{
static GQuark quark = 0;
if (!quark)
quark = g_quark_from_static_string ("tr-core");
return quark;
}
#define ICON_NAME "transmission" #define ICON_NAME "transmission"
@ -71,7 +62,7 @@ gtr_icon_refresh (gpointer vicon)
char tip[1024]; char tip[1024];
const char * idle = _("Idle"); const char * idle = _("Idle");
GtkStatusIcon * icon = GTK_STATUS_ICON (vicon); GtkStatusIcon * icon = GTK_STATUS_ICON (vicon);
tr_session * session = gtr_core_session (g_object_get_qdata (G_OBJECT (icon), get_core_quark ())); tr_session * session = gtr_core_session (g_object_get_qdata (G_OBJECT (icon), core_quark ()));
/* up */ /* up */
KBps = tr_sessionGetRawSpeed_KBps (session, TR_UP); KBps = tr_sessionGetRawSpeed_KBps (session, TR_UP);
@ -154,14 +145,14 @@ gtr_icon_new (TrCore * core)
w = gtr_action_get_widget ("/icon-popup"); w = gtr_action_get_widget ("/icon-popup");
app_indicator_set_menu (indicator, GTK_MENU (w)); app_indicator_set_menu (indicator, GTK_MENU (w));
app_indicator_set_title (indicator, g_get_application_name ()); app_indicator_set_title (indicator, g_get_application_name ());
g_object_set_qdata (G_OBJECT (indicator), get_core_quark (), core); g_object_set_qdata (G_OBJECT (indicator), core_quark (), core);
return indicator; return indicator;
#else #else
const char * icon_name = getIconName (); const char * icon_name = getIconName ();
GtkStatusIcon * icon = gtk_status_icon_new_from_icon_name (icon_name); GtkStatusIcon * icon = gtk_status_icon_new_from_icon_name (icon_name);
g_signal_connect (icon, "activate", G_CALLBACK (activated), NULL); g_signal_connect (icon, "activate", G_CALLBACK (activated), NULL);
g_signal_connect (icon, "popup-menu", G_CALLBACK (popup), NULL); g_signal_connect (icon, "popup-menu", G_CALLBACK (popup), NULL);
g_object_set_qdata (G_OBJECT (icon), get_core_quark (), core); g_object_set_qdata (G_OBJECT (icon), core_quark (), core);
return icon; return icon;
#endif #endif
} }

15
gtk/tr-window.c
View file

@ -66,21 +66,12 @@ typedef struct
} }
PrivateData; PrivateData;
static GQuark static G_DEFINE_QUARK (private-data, private_data)
get_private_data_key (void)
{
static GQuark q = 0;
if (!q)
q = g_quark_from_static_string ("private-data");
return q;
}
static PrivateData* static PrivateData*
get_private_data (GtkWindow * w) get_private_data (GtkWindow * w)
{ {
return g_object_get_qdata (G_OBJECT (w), get_private_data_key ()); return g_object_get_qdata (G_OBJECT (w), private_data_quark ());
} }
/*** /***
@ -620,7 +611,7 @@ gtr_window_new (GtkApplication * app, GtkUIManager * ui_mgr, TrCore * core)
/* make the window */ /* make the window */
self = gtk_application_window_new (app); self = gtk_application_window_new (app);
g_object_set_qdata_full (G_OBJECT (self), get_private_data_key (), p, privateFree); g_object_set_qdata_full (G_OBJECT (self), private_data_quark (), p, privateFree);
win = GTK_WINDOW (self); win = GTK_WINDOW (self);
gtk_window_set_title (win, g_get_application_name ()); gtk_window_set_title (win, g_get_application_name ());
gtk_window_set_role (win, "tr-main"); gtk_window_set_role (win, "tr-main");

11
gtk/util.c
View file

@ -664,16 +664,7 @@ freespace_label_data_free (gpointer gdata)
g_free (data); g_free (data);
} }
static GQuark static G_DEFINE_QUARK (freespace-label-data, freespace_label_data)
freespace_label_data_quark (void)
{
static GQuark q = 0;
if (G_UNLIKELY(!q))
q = g_quark_from_static_string ("data");
return q;
}
static void static void
on_freespace_label_core_destroyed (gpointer gdata, GObject * dead_core G_GNUC_UNUSED) on_freespace_label_core_destroyed (gpointer gdata, GObject * dead_core G_GNUC_UNUSED)