brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

src: Eliminate compiler warnings

Browse Source
This commit is contained in:
Jasper St. Pierre 2013-08-23 12:34:38 -04:00
parent 44e3811520
commit d3a88e59b9
3 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/shell-app-usage.c
View File

@ -419,14 +419,13 @@ shell_app_usage_init (ShellAppUsage *self)
self->currently_idle = FALSE; self->currently_idle = FALSE;
self->enable_monitoring = FALSE; self->enable_monitoring = FALSE;
g_object_get (shell_global_get(), "userdatadir", &shell_userdata_dir, NULL), g_object_get (global, "userdatadir", &shell_userdata_dir, NULL),
path = g_build_filename (shell_userdata_dir, DATA_FILENAME, NULL); path = g_build_filename (shell_userdata_dir, DATA_FILENAME, NULL);
g_free (shell_userdata_dir); g_free (shell_userdata_dir);
self->configfile = g_file_new_for_path (path); self->configfile = g_file_new_for_path (path);
g_free (path); g_free (path);
restore_from_file (self); restore_from_file (self);
self->privacy_settings = g_settings_new(PRIVACY_SCHEMA); self->privacy_settings = g_settings_new(PRIVACY_SCHEMA);
g_signal_connect (self->privacy_settings, g_signal_connect (self->privacy_settings,
"changed::" ENABLE_MONITORING_KEY, "changed::" ENABLE_MONITORING_KEY,

2
src/shell-global.c
View File

@ -1018,8 +1018,6 @@ void
shell_global_end_modal (ShellGlobal *global, shell_global_end_modal (ShellGlobal *global,
guint32 timestamp) guint32 timestamp)
{ {
ClutterActor *actor;
if (!global->has_modal) if (!global->has_modal)
return; return;

5
src/shell-window-tracker.c
View File

@ -191,10 +191,8 @@ get_app_from_window_wmclass (MetaWindow *window)
{ {
ShellApp *app; ShellApp *app;
ShellAppSystem *appsys; ShellAppSystem *appsys;
char *appid;
const char *wm_class; const char *wm_class;
const char *wm_instance; const char *wm_instance;
char *with_desktop;
appsys = shell_app_system_get_default (); appsys = shell_app_system_get_default ();
@ -372,12 +370,9 @@ static ShellApp *
get_app_for_window (ShellWindowTracker *tracker, get_app_for_window (ShellWindowTracker *tracker,
MetaWindow *window) MetaWindow *window)
{ {
ShellAppSystem *app_system;
ShellApp *result = NULL; ShellApp *result = NULL;
const char *startup_id; const char *startup_id;
app_system = shell_app_system_get_default ();
/* First, we check whether we already know about this window, /* First, we check whether we already know about this window,
* if so, just return that. * if so, just return that.
*/ */