[gnome-software] Convert all the 8-spaces to tabs
- From: Richard Hughes <rhughes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-software] Convert all the 8-spaces to tabs
- Date: Wed, 11 Sep 2013 15:14:17 +0000 (UTC)
commit b76492691f01ebed066f2c43968a0e06b0c9fa04
Author: Richard Hughes <richard hughsie com>
Date: Wed Sep 11 16:13:36 2013 +0100
Convert all the 8-spaces to tabs
I don't mind either using spaces or tabs, but having both in the same source file is kinda crazy.
Tabs were here first, so they win.
src/Makefile.am | 1 -
src/gs-app-tile.c | 58 ++--
src/gs-app-tile.h | 14 +-
src/gs-app-widget.c | 43 ++--
src/gs-app-widget.h | 4 +-
src/gs-app.c | 29 +-
src/gs-app.h | 20 +-
src/gs-application.c | 408 ++++++++++++++--------------
src/gs-application.h | 12 +-
src/gs-box.c | 384 +++++++++++++-------------
src/gs-box.h | 8 +-
src/gs-category-tile.c | 42 ++--
src/gs-category-tile.h | 8 +-
src/gs-category.c | 18 +-
src/gs-category.h | 27 +-
src/gs-feature-tile.c | 106 ++++----
src/gs-feature-tile.h | 8 +-
src/gs-main.c | 4 +-
src/gs-plugin-loader-sync.c | 8 +-
src/gs-plugin-loader.c | 4 +-
src/gs-plugin-loader.h | 2 +-
src/gs-popular-tile.c | 104 ++++----
src/gs-popular-tile.h | 9 +-
src/gs-shell-category.c | 399 ++++++++++++++--------------
src/gs-shell-category.h | 18 +-
src/gs-shell-details.c | 72 +++---
src/gs-shell-details.h | 6 +-
src/gs-shell-installed.c | 210 +++++++-------
src/gs-shell-installed.h | 6 +-
src/gs-shell-overview.c | 122 ++++----
src/gs-shell-overview.h | 10 +-
src/gs-shell-search.c | 64 +++---
src/gs-shell-search.h | 4 +-
src/gs-shell-updates.c | 306 +++++++++++-----------
src/gs-shell-updates.h | 8 +-
src/gs-shell.c | 316 +++++++++++-----------
src/gs-shell.h | 18 +-
src/gs-utils.c | 205 +++++++-------
src/gs-utils.h | 14 +-
src/plugins/appstream-app.c | 22 +-
src/plugins/appstream-cache.c | 4 +-
src/plugins/gs-plugin-datadir-apps.c | 4 +-
src/plugins/gs-plugin-datadir-filename.c | 4 +-
src/plugins/gs-plugin-desktopdb.c | 8 +-
src/plugins/gs-plugin-hardcoded-featured.c | 118 ++++----
src/plugins/gs-plugin-hardcoded-popular.c | 92 +++---
src/plugins/gs-plugin-hardcoded-ratings.c | 4 +-
src/plugins/gs-plugin-packagekit-refine.c | 10 +-
48 files changed, 1678 insertions(+), 1687 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 41bc7b2..fb8ee4d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -31,7 +31,6 @@ UI_FILES = \
gnome-software.ui \
popular-tile.ui
-
bin_PROGRAMS = \
gnome-software
diff --git a/src/gs-app-tile.c b/src/gs-app-tile.c
index 20b4d8d..7a7bb36 100644
--- a/src/gs-app-tile.c
+++ b/src/gs-app-tile.c
@@ -28,7 +28,7 @@
struct _GsAppTilePrivate
{
- GsApp *app;
+ GsApp *app;
GtkWidget *button;
GtkWidget *image;
GtkWidget *name;
@@ -47,33 +47,33 @@ static guint signals [SIGNAL_LAST] = { 0 };
GsApp *
gs_app_tile_get_app (GsAppTile *tile)
{
- GsAppTilePrivate *priv;
+ GsAppTilePrivate *priv;
g_return_val_if_fail (GS_IS_APP_TILE (tile), NULL);
- priv = gs_app_tile_get_instance_private (tile);
+ priv = gs_app_tile_get_instance_private (tile);
return priv->app;
}
void
gs_app_tile_set_app (GsAppTile *tile, GsApp *app)
{
- GsAppTilePrivate *priv;
- const gchar *summary;
+ GsAppTilePrivate *priv;
+ const gchar *summary;
g_return_if_fail (GS_IS_APP_TILE (tile));
g_return_if_fail (GS_IS_APP (app));
- priv = gs_app_tile_get_instance_private (tile);
+ priv = gs_app_tile_get_instance_private (tile);
- g_clear_object (&priv->app);
+ g_clear_object (&priv->app);
priv->app = g_object_ref (app);
- gtk_image_set_from_pixbuf (GTK_IMAGE (priv->image), gs_app_get_pixbuf (app));
- gtk_label_set_label (GTK_LABEL (priv->name), gs_app_get_name (app));
- summary = gs_app_get_summary (app);
- gtk_label_set_label (GTK_LABEL (priv->summary), summary);
- gtk_widget_set_visible (priv->summary, summary && summary[0]);
+ gtk_image_set_from_pixbuf (GTK_IMAGE (priv->image), gs_app_get_pixbuf (app));
+ gtk_label_set_label (GTK_LABEL (priv->name), gs_app_get_name (app));
+ summary = gs_app_get_summary (app);
+ gtk_label_set_label (GTK_LABEL (priv->summary), summary);
+ gtk_widget_set_visible (priv->summary, summary && summary[0]);
}
static void
@@ -82,7 +82,7 @@ gs_app_tile_destroy (GtkWidget *widget)
GsAppTile *tile = GS_APP_TILE (widget);
GsAppTilePrivate *priv;
- priv = gs_app_tile_get_instance_private (tile);
+ priv = gs_app_tile_get_instance_private (tile);
g_clear_object (&priv->app);
@@ -92,19 +92,19 @@ gs_app_tile_destroy (GtkWidget *widget)
static void
button_clicked (GsAppTile *tile)
{
- g_signal_emit (tile, signals[SIGNAL_CLICKED], 0);
+ g_signal_emit (tile, signals[SIGNAL_CLICKED], 0);
}
static void
gs_app_tile_init (GsAppTile *tile)
{
- GsAppTilePrivate *priv;
+ GsAppTilePrivate *priv;
- gtk_widget_set_has_window (GTK_WIDGET (tile), FALSE);
- gtk_widget_init_template (GTK_WIDGET (tile));
- priv = gs_app_tile_get_instance_private (tile);
- g_signal_connect_swapped (priv->button, "clicked",
- G_CALLBACK (button_clicked), tile);
+ gtk_widget_set_has_window (GTK_WIDGET (tile), FALSE);
+ gtk_widget_init_template (GTK_WIDGET (tile));
+ priv = gs_app_tile_get_instance_private (tile);
+ g_signal_connect_swapped (priv->button, "clicked",
+ G_CALLBACK (button_clicked), tile);
}
static void
@@ -122,23 +122,23 @@ gs_app_tile_class_init (GsAppTileClass *klass)
NULL, NULL, g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
- gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/software/app-tile.ui");
+ gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/software/app-tile.ui");
- gtk_widget_class_bind_template_child_private (widget_class, GsAppTile, button);
- gtk_widget_class_bind_template_child_private (widget_class, GsAppTile, image);
- gtk_widget_class_bind_template_child_private (widget_class, GsAppTile, name);
- gtk_widget_class_bind_template_child_private (widget_class, GsAppTile, summary);
+ gtk_widget_class_bind_template_child_private (widget_class, GsAppTile, button);
+ gtk_widget_class_bind_template_child_private (widget_class, GsAppTile, image);
+ gtk_widget_class_bind_template_child_private (widget_class, GsAppTile, name);
+ gtk_widget_class_bind_template_child_private (widget_class, GsAppTile, summary);
}
GtkWidget *
gs_app_tile_new (GsApp *cat)
{
- GsAppTile *tile;
+ GsAppTile *tile;
- tile = g_object_new (GS_TYPE_APP_TILE, NULL);
- gs_app_tile_set_app (tile, cat);
+ tile = g_object_new (GS_TYPE_APP_TILE, NULL);
+ gs_app_tile_set_app (tile, cat);
- return GTK_WIDGET (tile);
+ return GTK_WIDGET (tile);
}
/* vim: set noexpandtab: */
diff --git a/src/gs-app-tile.h b/src/gs-app-tile.h
index c9a28fc..9a39452 100644
--- a/src/gs-app-tile.h
+++ b/src/gs-app-tile.h
@@ -28,7 +28,7 @@
#define GS_TYPE_APP_TILE (gs_app_tile_get_type())
#define GS_APP_TILE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GS_TYPE_APP_TILE, GsAppTile))
-#define GS_APP_TILE_CLASS(cls) (G_TYPE_CHECK_CLASS_CAST((cls), GS_TYPE_APP_TILE, GsAppTileClass))
+#define GS_APP_TILE_CLASS(cls) (G_TYPE_CHECK_CLASS_CAST((cls), GS_TYPE_APP_TILE, GsAppTileClass))
#define GS_IS_APP_TILE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), GS_TYPE_APP_TILE))
#define GS_IS_APP_TILE_CLASS(cls) (G_TYPE_CHECK_CLASS_TYPE((cls), GS_TYPE_APP_TILE))
#define GS_APP_TILE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GS_TYPE_APP_TILE, GsAppTileClass))
@@ -41,22 +41,22 @@ typedef struct _GsAppTilePrivate GsAppTilePrivate;
struct _GsAppTile
{
- GtkBin parent;
+ GtkBin parent;
GsAppTilePrivate *priv;
};
struct _GsAppTileClass
{
- GtkBinClass parent_class;
+ GtkBinClass parent_class;
- void (*clicked) (GsAppTile *tile);
+ void (*clicked) (GsAppTile *tile);
};
GType gs_app_tile_get_type (void);
-GtkWidget *gs_app_tile_new (GsApp *app);
-GsApp *gs_app_tile_get_app (GsAppTile *tile);
+GtkWidget *gs_app_tile_new (GsApp *app);
+GsApp *gs_app_tile_get_app (GsAppTile *tile);
void gs_app_tile_set_app (GsAppTile *tile,
- GsApp *cat);
+ GsApp *cat);
G_END_DECLS
diff --git a/src/gs-app-widget.c b/src/gs-app-widget.c
index 9ec1329..e74ff7b 100644
--- a/src/gs-app-widget.c
+++ b/src/gs-app-widget.c
@@ -38,7 +38,7 @@ struct _GsAppWidgetPrivate
GtkWidget *button_box;
GtkWidget *button;
GtkWidget *spinner;
- gboolean colorful;
+ gboolean colorful;
};
G_DEFINE_TYPE_WITH_PRIVATE (GsAppWidget, gs_app_widget, GTK_TYPE_BIN)
@@ -82,7 +82,7 @@ gs_app_widget_refresh (GsAppWidget *app_widget)
g_string_free (str, TRUE);
gtk_label_set_label (GTK_LABEL (priv->name_label),
- gs_app_get_name (priv->app));
+ gs_app_get_name (priv->app));
if (gs_app_get_state (priv->app) == GS_APP_STATE_UPDATABLE) {
gtk_label_set_label (GTK_LABEL (priv->version_label),
gs_app_get_update_version (priv->app));
@@ -109,8 +109,8 @@ gs_app_widget_refresh (GsAppWidget *app_widget)
gtk_widget_set_visible (priv->spinner, FALSE);
gtk_widget_set_visible (priv->button, TRUE);
gtk_button_set_label (GTK_BUTTON (priv->button), _("Remove"));
- if (priv->colorful)
- gtk_style_context_add_class (context, "destructive-action");
+ if (priv->colorful)
+ gtk_style_context_add_class (context, "destructive-action");
break;
case GS_APP_STATE_UPDATABLE:
gtk_widget_set_visible (priv->spinner, FALSE);
@@ -136,7 +136,7 @@ gs_app_widget_refresh (GsAppWidget *app_widget)
break;
}
gtk_widget_set_visible (priv->button_box, gtk_widget_get_visible (priv->spinner) ||
- gtk_widget_get_visible (priv->button));
+ gtk_widget_get_visible (priv->button));
}
/**
@@ -149,7 +149,6 @@ gs_app_widget_get_app (GsAppWidget *app_widget)
return app_widget->priv->app;
}
-
/**
* gs_app_widget_set_app:
**/
@@ -160,8 +159,8 @@ gs_app_widget_set_app (GsAppWidget *app_widget, GsApp *app)
g_return_if_fail (GS_IS_APP (app));
app_widget->priv->app = g_object_ref (app);
g_signal_connect_object (app_widget->priv->app, "state-changed",
- G_CALLBACK (gs_app_widget_refresh),
- app_widget, G_CONNECT_SWAPPED);
+ G_CALLBACK (gs_app_widget_refresh),
+ app_widget, G_CONNECT_SWAPPED);
gs_app_widget_refresh (app_widget);
}
@@ -194,16 +193,16 @@ gs_app_widget_class_init (GsAppWidgetClass *klass)
NULL, NULL, g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
- gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/software/app-widget.ui");
+ gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/software/app-widget.ui");
- gtk_widget_class_bind_template_child_private (widget_class, GsAppWidget, image);
- gtk_widget_class_bind_template_child_private (widget_class, GsAppWidget, name_box);
- gtk_widget_class_bind_template_child_private (widget_class, GsAppWidget, name_label);
- gtk_widget_class_bind_template_child_private (widget_class, GsAppWidget, version_label);
- gtk_widget_class_bind_template_child_private (widget_class, GsAppWidget, description_label);
- gtk_widget_class_bind_template_child_private (widget_class, GsAppWidget, button_box);
- gtk_widget_class_bind_template_child_private (widget_class, GsAppWidget, button);
- gtk_widget_class_bind_template_child_private (widget_class, GsAppWidget, spinner);
+ gtk_widget_class_bind_template_child_private (widget_class, GsAppWidget, image);
+ gtk_widget_class_bind_template_child_private (widget_class, GsAppWidget, name_box);
+ gtk_widget_class_bind_template_child_private (widget_class, GsAppWidget, name_label);
+ gtk_widget_class_bind_template_child_private (widget_class, GsAppWidget, version_label);
+ gtk_widget_class_bind_template_child_private (widget_class, GsAppWidget, description_label);
+ gtk_widget_class_bind_template_child_private (widget_class, GsAppWidget, button_box);
+ gtk_widget_class_bind_template_child_private (widget_class, GsAppWidget, button);
+ gtk_widget_class_bind_template_child_private (widget_class, GsAppWidget, spinner);
}
static void
@@ -220,10 +219,10 @@ gs_app_widget_init (GsAppWidget *app_widget)
priv = gs_app_widget_get_instance_private (app_widget);
app_widget->priv = priv;
- gtk_widget_set_has_window (GTK_WIDGET (app_widget), FALSE);
- gtk_widget_init_template (GTK_WIDGET (app_widget));
+ gtk_widget_set_has_window (GTK_WIDGET (app_widget), FALSE);
+ gtk_widget_init_template (GTK_WIDGET (app_widget));
- priv->colorful = TRUE;
+ priv->colorful = TRUE;
g_signal_connect (priv->button, "clicked",
G_CALLBACK (button_clicked), app_widget);
@@ -240,9 +239,9 @@ gs_app_widget_set_size_groups (GsAppWidget *app_widget,
void
gs_app_widget_set_colorful (GsAppWidget *app_widget,
- gboolean colorful)
+ gboolean colorful)
{
- app_widget->priv->colorful = colorful;
+ app_widget->priv->colorful = colorful;
}
GtkWidget *
diff --git a/src/gs-app-widget.h b/src/gs-app-widget.h
index 17693e2..a01d1c6 100644
--- a/src/gs-app-widget.h
+++ b/src/gs-app-widget.h
@@ -55,8 +55,8 @@ struct _GsAppWidgetClass
GType gs_app_widget_get_type (void);
GtkWidget *gs_app_widget_new (void);
-void gs_app_widget_set_colorful (GsAppWidget *app_widget,
- gboolean colorful);
+void gs_app_widget_set_colorful (GsAppWidget *app_widget,
+ gboolean colorful);
GsApp *gs_app_widget_get_app (GsAppWidget *app_widget);
void gs_app_widget_set_app (GsAppWidget *app_widget,
GsApp *app);
diff --git a/src/gs-app.c b/src/gs-app.c
index 9471f12..d4d4225 100644
--- a/src/gs-app.c
+++ b/src/gs-app.c
@@ -59,19 +59,19 @@ struct GsAppPrivate
gchar *summary;
gchar *description;
gchar *screenshot;
- gchar *url;
- gchar *update_version;
- gchar *update_details;
- gchar *management_plugin;
+ gchar *url;
+ gchar *update_version;
+ gchar *update_details;
+ gchar *management_plugin;
gint rating;
GsAppKind kind;
GsAppState state;
GHashTable *metadata;
GdkPixbuf *pixbuf;
GdkPixbuf *featured_pixbuf;
- GPtrArray *related; /* of GsApp */
- GPtrArray *history; /* of GsApp */
- guint64 install_date;
+ GPtrArray *related; /* of GsApp */
+ GPtrArray *history; /* of GsApp */
+ guint64 install_date;
};
enum {
@@ -86,7 +86,7 @@ enum {
PROP_RATING,
PROP_KIND,
PROP_STATE,
- PROP_INSTALL_DATE,
+ PROP_INSTALL_DATE,
PROP_LAST
};
@@ -189,8 +189,8 @@ gs_app_to_string (GsApp *app)
g_string_append_printf (str, "\tpixbuf:\t%p\n", priv->pixbuf);
if (priv->featured_pixbuf != NULL)
g_string_append_printf (str, "\tfeatured-pixbuf:\t%p\n", priv->featured_pixbuf);
- if (priv->install_date != 0)
- g_string_append_printf (str, "\tinstall-date:\t%lu\n", priv->install_date);
+ if (priv->install_date != 0)
+ g_string_append_printf (str, "\tinstall-date:\t%lu\n", priv->install_date);
if (priv->related->len > 0)
g_string_append_printf (str, "\trelated:\t%i\n", priv->related->len);
if (priv->history->len > 0)
@@ -489,7 +489,6 @@ gs_app_get_version (GsApp *app)
return app->priv->version;
}
-
/**
* gs_app_get_pretty_version:
*
@@ -797,15 +796,15 @@ gs_app_add_history (GsApp *app, GsApp *app2)
guint64
gs_app_get_install_date (GsApp *app)
{
- g_return_val_if_fail (GS_IS_APP (app), 0);
- return app->priv->install_date;
+ g_return_val_if_fail (GS_IS_APP (app), 0);
+ return app->priv->install_date;
}
void
gs_app_set_install_date (GsApp *app, guint64 install_date)
{
- g_return_if_fail (GS_IS_APP (app));
- app->priv->install_date = install_date;
+ g_return_if_fail (GS_IS_APP (app));
+ app->priv->install_date = install_date;
}
/**
diff --git a/src/gs-app.h b/src/gs-app.h
index b6026d0..ac03b91 100644
--- a/src/gs-app.h
+++ b/src/gs-app.h
@@ -30,7 +30,7 @@ G_BEGIN_DECLS
#define GS_TYPE_APP (gs_app_get_type ())
#define GS_APP(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GS_TYPE_APP, GsApp))
#define GS_APP_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GS_TYPE_APP, GsAppClass))
-#define GS_IS_APP(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GS_TYPE_APP))
+#define GS_IS_APP(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GS_TYPE_APP))
#define GS_IS_APP_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GS_TYPE_APP))
#define GS_APP_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GS_TYPE_APP, GsAppClass))
#define GS_APP_ERROR (gs_app_error_quark ())
@@ -82,7 +82,7 @@ const gchar *gs_app_kind_to_string (GsAppKind kind);
const gchar *gs_app_state_to_string (GsAppState state);
const gchar *gs_app_get_id (GsApp *app);
-void gs_app_set_id (GsApp *app,
+void gs_app_set_id (GsApp *app,
const gchar *id);
GsAppKind gs_app_get_kind (GsApp *app);
void gs_app_set_kind (GsApp *app,
@@ -91,13 +91,13 @@ GsAppState gs_app_get_state (GsApp *app);
void gs_app_set_state (GsApp *app,
GsAppState state);
const gchar *gs_app_get_name (GsApp *app);
-void gs_app_set_name (GsApp *app,
+void gs_app_set_name (GsApp *app,
const gchar *name);
const gchar *gs_app_get_source (GsApp *app);
-void gs_app_set_source (GsApp *app,
+void gs_app_set_source (GsApp *app,
const gchar *source);
const gchar *gs_app_get_version (GsApp *app);
-void gs_app_set_version (GsApp *app,
+void gs_app_set_version (GsApp *app,
const gchar *version);
const gchar *gs_app_get_summary (GsApp *app);
void gs_app_set_summary (GsApp *app,
@@ -105,8 +105,8 @@ void gs_app_set_summary (GsApp *app,
const gchar *gs_app_get_description (GsApp *app);
void gs_app_set_description (GsApp *app,
const gchar *description);
-const gchar *gs_app_get_url (GsApp *app);
-void gs_app_set_url (GsApp *app,
+const gchar *gs_app_get_url (GsApp *app);
+void gs_app_set_url (GsApp *app,
const gchar *url);
const gchar *gs_app_get_screenshot (GsApp *app);
void gs_app_set_screenshot (GsApp *app,
@@ -140,9 +140,9 @@ void gs_app_add_related (GsApp *app,
GPtrArray *gs_app_get_history (GsApp *app);
void gs_app_add_history (GsApp *app,
GsApp *app2);
-guint64 gs_app_get_install_date (GsApp *app);
-void gs_app_set_install_date (GsApp *app,
- guint64 install_date);
+guint64 gs_app_get_install_date (GsApp *app);
+void gs_app_set_install_date (GsApp *app,
+ guint64 install_date);
G_END_DECLS
diff --git a/src/gs-application.c b/src/gs-application.c
index adff9c1..622f8b3 100644
--- a/src/gs-application.c
+++ b/src/gs-application.c
@@ -34,19 +34,19 @@
#include "gs-plugin-loader.h"
struct _GsApplication {
- GtkApplication parent;
-
- GCancellable *cancellable;
- GtkApplication *application;
- PkTask *task;
- GtkCssProvider *provider;
- GsPluginLoader *plugin_loader;
- gint pending_apps;
- GsShell *shell;
+ GtkApplication parent;
+
+ GCancellable *cancellable;
+ GtkApplication *application;
+ PkTask *task;
+ GtkCssProvider *provider;
+ GsPluginLoader *plugin_loader;
+ gint pending_apps;
+ GsShell *shell;
};
struct _GsApplicationClass {
- GtkApplicationClass parent_class;
+ GtkApplicationClass parent_class;
};
G_DEFINE_TYPE (GsApplication, gs_application, GTK_TYPE_APPLICATION);
@@ -58,238 +58,238 @@ gs_application_init (GsApplication *application)
static void
about_activated (GSimpleAction *action,
- GVariant *parameter,
- gpointer app)
+ GVariant *parameter,
+ gpointer app)
{
- const gchar *authors[] = {
- "Richard Hughes",
- "Matthias Clasen",
- "Allan Day",
- "Ryan Lerch",
- "William Jon McCann",
- NULL
- };
- const gchar *copyright = "Copyright \xc2\xa9 2013 Richard Hughes, Matthias Clasen";
- GtkIconTheme *icon_theme;
- GdkPixbuf *logo;
- GList *windows;
- GtkWindow *parent = NULL;
-
- windows = gtk_application_get_windows (GTK_APPLICATION (app));
- if (windows)
- parent = windows->data;
-
- icon_theme = gtk_icon_theme_get_default ();
- logo = gtk_icon_theme_load_icon (icon_theme, "gnome-software", 256, 0, NULL);
-
- gtk_show_about_dialog (parent,
- "title", _("About GNOME Software"),
- "program-name", _("GNOME Software"),
- "authors", authors,
- "comments", _("A nice way to manage the software on your system."),
- "copyright", copyright,
- "license-type", GTK_LICENSE_GPL_2_0,
- "logo", logo,
- "translator-credits", _("translator-credits"),
- "version", VERSION,
- NULL);
-
- g_object_unref (logo);
+ const gchar *authors[] = {
+ "Richard Hughes",
+ "Matthias Clasen",
+ "Allan Day",
+ "Ryan Lerch",
+ "William Jon McCann",
+ NULL
+ };
+ const gchar *copyright = "Copyright \xc2\xa9 2013 Richard Hughes, Matthias Clasen";
+ GtkIconTheme *icon_theme;
+ GdkPixbuf *logo;
+ GList *windows;
+ GtkWindow *parent = NULL;
+
+ windows = gtk_application_get_windows (GTK_APPLICATION (app));
+ if (windows)
+ parent = windows->data;
+
+ icon_theme = gtk_icon_theme_get_default ();
+ logo = gtk_icon_theme_load_icon (icon_theme, "gnome-software", 256, 0, NULL);
+
+ gtk_show_about_dialog (parent,
+ "title", _("About GNOME Software"),
+ "program-name", _("GNOME Software"),
+ "authors", authors,
+ "comments", _("A nice way to manage the software on your system."),
+ "copyright", copyright,
+ "license-type", GTK_LICENSE_GPL_2_0,
+ "logo", logo,
+ "translator-credits", _("translator-credits"),
+ "version", VERSION,
+ NULL);
+
+ g_object_unref (logo);
}
static void
quit_activated (GSimpleAction *action,
- GVariant *parameter,
- gpointer app)
+ GVariant *parameter,
+ gpointer app)
{
- g_application_quit (G_APPLICATION (app));
+ g_application_quit (G_APPLICATION (app));
}
static GActionEntry actions[] = {
- { "about", about_activated, NULL, NULL, NULL },
- { "quit", quit_activated, NULL, NULL, NULL }
+ { "about", about_activated, NULL, NULL, NULL },
+ { "quit", quit_activated, NULL, NULL, NULL }
};
static void
gs_application_startup (GApplication *application)
{
- GsApplication *app = GS_APPLICATION (application);
- GtkBuilder *builder;
- GMenuModel *app_menu;
- GtkWindow *window;
- GFile *file;
- GError *error = NULL;
-
- G_APPLICATION_CLASS (gs_application_parent_class)->startup (application);
-
- notify_init ("gnome-software");
-
- g_type_ensure (GS_TYPE_BOX);
-
- gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (),
- DATADIR "/gnome-software/icons/hicolor");
-
- /* set up the app menu */
- g_action_map_add_action_entries (G_ACTION_MAP (app),
- actions, G_N_ELEMENTS (actions),
- application);
- builder = gtk_builder_new_from_resource ("/org/gnome/software/app-menu.ui");
- app_menu = G_MENU_MODEL (gtk_builder_get_object (builder, "appmenu"));
- gtk_application_set_app_menu (GTK_APPLICATION (app), app_menu);
- g_object_unref (builder);
-
- /* get CSS */
- app->provider = gtk_css_provider_new ();
- gtk_style_context_add_provider_for_screen (gdk_screen_get_default (),
- GTK_STYLE_PROVIDER (app->provider),
- GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
- file = g_file_new_for_uri ("resource:///org/gnome/software/gtk-style.css");
- gtk_css_provider_load_from_file (app->provider, file, NULL);
- g_object_unref (file);
-
- /* setup pk */
- app->task = pk_task_new ();
- g_object_set (app->task, "background", FALSE, NULL);
-
- /* setup plugins */
- app->plugin_loader = gs_plugin_loader_new ();
- gs_plugin_loader_set_location (app->plugin_loader, NULL);
- if (!gs_plugin_loader_setup (app->plugin_loader, &error)) {
- g_warning ("Failed to setup plugins: %s", error->message);
- exit (1);
- }
- gs_plugin_loader_set_enabled (app->plugin_loader, "hardcoded-featured", TRUE);
- gs_plugin_loader_set_enabled (app->plugin_loader, "hardcoded-kind", TRUE);
- gs_plugin_loader_set_enabled (app->plugin_loader, "hardcoded-popular", TRUE);
- gs_plugin_loader_set_enabled (app->plugin_loader, "hardcoded-ratings", TRUE);
- gs_plugin_loader_set_enabled (app->plugin_loader, "hardcoded-screenshots", TRUE);
- gs_plugin_loader_set_enabled (app->plugin_loader, "hardcoded-menu-spec", TRUE);
- gs_plugin_loader_set_enabled (app->plugin_loader, "local-ratings", TRUE);
- gs_plugin_loader_set_enabled (app->plugin_loader, "packagekit", TRUE);
- gs_plugin_loader_set_enabled (app->plugin_loader, "packagekit-refine", TRUE);
- gs_plugin_loader_set_enabled (app->plugin_loader, "packagekit-history", TRUE);
- gs_plugin_loader_set_enabled (app->plugin_loader, "appstream", TRUE);
- gs_plugin_loader_set_enabled (app->plugin_loader, "desktopdb", TRUE);
- gs_plugin_loader_set_enabled (app->plugin_loader, "datadir-apps", TRUE);
- gs_plugin_loader_set_enabled (app->plugin_loader, "datadir-filename", TRUE);
- gs_plugin_loader_set_enabled (app->plugin_loader, "datadir-filename-local", TRUE);
-
- /* show the priority of each plugin */
- gs_plugin_loader_dump_state (app->plugin_loader);
-
- /* setup UI */
- app->shell = gs_shell_new ();
-
- app->cancellable = g_cancellable_new ();
-
- window = gs_shell_setup (app->shell, app->plugin_loader, app->cancellable);
- gtk_application_add_window (GTK_APPLICATION (app), window);
-
- g_signal_connect_swapped (app->shell, "loaded",
- G_CALLBACK (gtk_window_present), window);
+ GsApplication *app = GS_APPLICATION (application);
+ GtkBuilder *builder;
+ GMenuModel *app_menu;
+ GtkWindow *window;
+ GFile *file;
+ GError *error = NULL;
+
+ G_APPLICATION_CLASS (gs_application_parent_class)->startup (application);
+
+ notify_init ("gnome-software");
+
+ g_type_ensure (GS_TYPE_BOX);
+
+ gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (),
+ DATADIR "/gnome-software/icons/hicolor");
+
+ /* set up the app menu */
+ g_action_map_add_action_entries (G_ACTION_MAP (app),
+ actions, G_N_ELEMENTS (actions),
+ application);
+ builder = gtk_builder_new_from_resource ("/org/gnome/software/app-menu.ui");
+ app_menu = G_MENU_MODEL (gtk_builder_get_object (builder, "appmenu"));
+ gtk_application_set_app_menu (GTK_APPLICATION (app), app_menu);
+ g_object_unref (builder);
+
+ /* get CSS */
+ app->provider = gtk_css_provider_new ();
+ gtk_style_context_add_provider_for_screen (gdk_screen_get_default (),
+ GTK_STYLE_PROVIDER (app->provider),
+ GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+ file = g_file_new_for_uri ("resource:///org/gnome/software/gtk-style.css");
+ gtk_css_provider_load_from_file (app->provider, file, NULL);
+ g_object_unref (file);
+
+ /* setup pk */
+ app->task = pk_task_new ();
+ g_object_set (app->task, "background", FALSE, NULL);
+
+ /* setup plugins */
+ app->plugin_loader = gs_plugin_loader_new ();
+ gs_plugin_loader_set_location (app->plugin_loader, NULL);
+ if (!gs_plugin_loader_setup (app->plugin_loader, &error)) {
+ g_warning ("Failed to setup plugins: %s", error->message);
+ exit (1);
+ }
+ gs_plugin_loader_set_enabled (app->plugin_loader, "hardcoded-featured", TRUE);
+ gs_plugin_loader_set_enabled (app->plugin_loader, "hardcoded-kind", TRUE);
+ gs_plugin_loader_set_enabled (app->plugin_loader, "hardcoded-popular", TRUE);
+ gs_plugin_loader_set_enabled (app->plugin_loader, "hardcoded-ratings", TRUE);
+ gs_plugin_loader_set_enabled (app->plugin_loader, "hardcoded-screenshots", TRUE);
+ gs_plugin_loader_set_enabled (app->plugin_loader, "hardcoded-menu-spec", TRUE);
+ gs_plugin_loader_set_enabled (app->plugin_loader, "local-ratings", TRUE);
+ gs_plugin_loader_set_enabled (app->plugin_loader, "packagekit", TRUE);
+ gs_plugin_loader_set_enabled (app->plugin_loader, "packagekit-refine", TRUE);
+ gs_plugin_loader_set_enabled (app->plugin_loader, "packagekit-history", TRUE);
+ gs_plugin_loader_set_enabled (app->plugin_loader, "appstream", TRUE);
+ gs_plugin_loader_set_enabled (app->plugin_loader, "desktopdb", TRUE);
+ gs_plugin_loader_set_enabled (app->plugin_loader, "datadir-apps", TRUE);
+ gs_plugin_loader_set_enabled (app->plugin_loader, "datadir-filename", TRUE);
+ gs_plugin_loader_set_enabled (app->plugin_loader, "datadir-filename-local", TRUE);
+
+ /* show the priority of each plugin */
+ gs_plugin_loader_dump_state (app->plugin_loader);
+
+ /* setup UI */
+ app->shell = gs_shell_new ();
+
+ app->cancellable = g_cancellable_new ();
+
+ window = gs_shell_setup (app->shell, app->plugin_loader, app->cancellable);
+ gtk_application_add_window (GTK_APPLICATION (app), window);
+
+ g_signal_connect_swapped (app->shell, "loaded",
+ G_CALLBACK (gtk_window_present), window);
}
static void
gs_application_activate (GApplication *application)
{
- gs_shell_activate (GS_APPLICATION (application)->shell);
+ gs_shell_activate (GS_APPLICATION (application)->shell);
}
static int
-gs_application_command_line (GApplication *application,
- GApplicationCommandLine *cmdline)
+gs_application_command_line (GApplication *application,
+ GApplicationCommandLine *cmdline)
{
- GsApplication *app = GS_APPLICATION (application);
- GOptionContext *context;
- gchar *mode = NULL;
- gboolean help = FALSE;
- gboolean verbose = FALSE;
- const GOptionEntry options[] = {
- { "mode", '\0', 0, G_OPTION_ARG_STRING, &mode,
- _("Start up mode, either 'updates', 'installed' or 'overview'"), _("MODE") },
- { "verbose", 'v', 0, G_OPTION_ARG_NONE, &verbose, NULL, NULL },
- { "help", '?', 0, G_OPTION_ARG_NONE, &help, NULL, NULL },
-
- { NULL}
- };
- gchar **args, **argv;
- gint argc;
- gint i;
- GError *error = NULL;
-
- args = g_application_command_line_get_arguments (cmdline, &argc);
- /* We have to make an extra copy of the array, since g_option_context_parse()
- * assumes that it can remove strings from the array without freeing them.
- */
- argv = g_new (gchar*, argc + 1);
- for (i = 0; i <= argc; i++)
- argv[i] = args[i];
-
- context = g_option_context_new ("");
- g_option_context_set_help_enabled (context, FALSE);
- g_option_context_add_main_entries (context, options, NULL);
- if (!g_option_context_parse (context, &argc, &argv, &error)) {
- g_application_command_line_printerr (cmdline, "%s\n", error->message);
- g_error_free (error);
- g_application_command_line_set_exit_status (cmdline, 1);
- }
- else if (help) {
- gchar *text;
- text = g_option_context_get_help (context, FALSE, NULL);
- g_application_command_line_print (cmdline, "%s", text);
- g_free (text);
- }
- if (verbose)
- g_setenv ("G_MESSAGES_DEBUG", "all", FALSE);
- if (mode) {
- if (g_strcmp0 (mode, "updates") == 0) {
- gs_shell_set_mode (app->shell, GS_SHELL_MODE_UPDATES);
- } else if (g_strcmp0 (mode, "installed") == 0) {
- gs_shell_set_mode (app->shell, GS_SHELL_MODE_INSTALLED);
- } else if (g_strcmp0 (mode, "overview") == 0) {
- /* this is the default */
- } else {
- g_warning ("Mode '%s' not recognised", mode);
- }
- }
-
- g_free (argv);
- g_strfreev (args);
-
- g_option_context_free (context);
-
- return 0;
+ GsApplication *app = GS_APPLICATION (application);
+ GOptionContext *context;
+ gchar *mode = NULL;
+ gboolean help = FALSE;
+ gboolean verbose = FALSE;
+ const GOptionEntry options[] = {
+ { "mode", '\0', 0, G_OPTION_ARG_STRING, &mode,
+ _("Start up mode, either 'updates', 'installed' or 'overview'"), _("MODE") },
+ { "verbose", 'v', 0, G_OPTION_ARG_NONE, &verbose, NULL, NULL },
+ { "help", '?', 0, G_OPTION_ARG_NONE, &help, NULL, NULL },
+
+ { NULL}
+ };
+ gchar **args, **argv;
+ gint argc;
+ gint i;
+ GError *error = NULL;
+
+ args = g_application_command_line_get_arguments (cmdline, &argc);
+ /* We have to make an extra copy of the array, since g_option_context_parse()
+ * assumes that it can remove strings from the array without freeing them.
+ */
+ argv = g_new (gchar*, argc + 1);
+ for (i = 0; i <= argc; i++)
+ argv[i] = args[i];
+
+ context = g_option_context_new ("");
+ g_option_context_set_help_enabled (context, FALSE);
+ g_option_context_add_main_entries (context, options, NULL);
+ if (!g_option_context_parse (context, &argc, &argv, &error)) {
+ g_application_command_line_printerr (cmdline, "%s\n", error->message);
+ g_error_free (error);
+ g_application_command_line_set_exit_status (cmdline, 1);
+ }
+ else if (help) {
+ gchar *text;
+ text = g_option_context_get_help (context, FALSE, NULL);
+ g_application_command_line_print (cmdline, "%s", text);
+ g_free (text);
+ }
+ if (verbose)
+ g_setenv ("G_MESSAGES_DEBUG", "all", FALSE);
+ if (mode) {
+ if (g_strcmp0 (mode, "updates") == 0) {
+ gs_shell_set_mode (app->shell, GS_SHELL_MODE_UPDATES);
+ } else if (g_strcmp0 (mode, "installed") == 0) {
+ gs_shell_set_mode (app->shell, GS_SHELL_MODE_INSTALLED);
+ } else if (g_strcmp0 (mode, "overview") == 0) {
+ /* this is the default */
+ } else {
+ g_warning ("Mode '%s' not recognised", mode);
+ }
+ }
+
+ g_free (argv);
+ g_strfreev (args);
+
+ g_option_context_free (context);
+
+ return 0;
}
static void
gs_application_finalize (GObject *object)
{
- GsApplication *app = GS_APPLICATION (object);
-
- g_clear_object (&app->plugin_loader);
- g_clear_object (&app->task);
- g_clear_object (&app->cancellable);
- g_clear_object (&app->shell);
- g_clear_object (&app->provider);
- G_OBJECT_CLASS (gs_application_parent_class)->finalize (object);
+ GsApplication *app = GS_APPLICATION (object);
+
+ g_clear_object (&app->plugin_loader);
+ g_clear_object (&app->task);
+ g_clear_object (&app->cancellable);
+ g_clear_object (&app->shell);
+ g_clear_object (&app->provider);
+ G_OBJECT_CLASS (gs_application_parent_class)->finalize (object);
}
static void
gs_application_class_init (GsApplicationClass *class)
{
- G_OBJECT_CLASS (class)->finalize = gs_application_finalize;
- G_APPLICATION_CLASS (class)->startup = gs_application_startup;
- G_APPLICATION_CLASS (class)->activate = gs_application_activate;
- G_APPLICATION_CLASS (class)->command_line = gs_application_command_line;
+ G_OBJECT_CLASS (class)->finalize = gs_application_finalize;
+ G_APPLICATION_CLASS (class)->startup = gs_application_startup;
+ G_APPLICATION_CLASS (class)->activate = gs_application_activate;
+ G_APPLICATION_CLASS (class)->command_line = gs_application_command_line;
}
GsApplication *
gs_application_new (void)
{
- return g_object_new (GS_APPLICATION_TYPE,
- "application-id", "org.gnome.Software",
- "flags", G_APPLICATION_HANDLES_COMMAND_LINE,
- NULL);
+ return g_object_new (GS_APPLICATION_TYPE,
+ "application-id", "org.gnome.Software",
+ "flags", G_APPLICATION_HANDLES_COMMAND_LINE,
+ NULL);
}
/* vim: set noexpandtab: */
diff --git a/src/gs-application.h b/src/gs-application.h
index 9c8bcdd..b0875c5 100644
--- a/src/gs-application.h
+++ b/src/gs-application.h
@@ -24,18 +24,14 @@
#include <gtk/gtk.h>
-
#define GS_APPLICATION_TYPE (gs_application_get_type ())
#define GS_APPLICATION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GS_APPLICATION_TYPE, GsApplication))
+typedef struct _GsApplication GsApplication;
+typedef struct _GsApplicationClass GsApplicationClass;
-typedef struct _GsApplication GsApplication;
-typedef struct _GsApplicationClass GsApplicationClass;
-
-
-GType gs_application_get_type (void);
-GsApplication *gs_application_new (void);
-
+GType gs_application_get_type (void);
+GsApplication *gs_application_new (void);
#endif /* __GS_APPLICATION_H */
diff --git a/src/gs-box.c b/src/gs-box.c
index c2370ee..4ccc099 100644
--- a/src/gs-box.c
+++ b/src/gs-box.c
@@ -27,273 +27,273 @@
#include "gs-box.h"
typedef struct {
- GtkWidget *widget;
- gdouble relative_size;
+ GtkWidget *widget;
+ gdouble relative_size;
} GsBoxChild;
struct _GsBox {
- GtkContainer parent;
- GList *children;
- gdouble total;
+ GtkContainer parent;
+ GList *children;
+ gdouble total;
};
struct _GsBoxClass {
- GtkContainerClass parent_class;
+ GtkContainerClass parent_class;
};
G_DEFINE_TYPE (GsBox, gs_box, GTK_TYPE_CONTAINER)
enum {
- CHILD_PROP_0,
- CHILD_PROP_RELATIVE_SIZE
+ CHILD_PROP_0,
+ CHILD_PROP_RELATIVE_SIZE
};
static void
gs_box_real_add (GtkContainer *container, GtkWidget *widget)
{
- gs_box_add (GS_BOX (container), widget, 1.0);
+ gs_box_add (GS_BOX (container), widget, 1.0);
}
static void
gs_box_remove (GtkContainer *container, GtkWidget *widget)
{
- GsBox *box = GS_BOX (container);
- GList *l;
-
- for (l = box->children; l; l = l->next) {
- GsBoxChild *child = l->data;
- if (child->widget == widget) {
- gtk_widget_unparent (child->widget);
- box->children = g_list_delete_link (box->children, l);
- box->total -= child->relative_size;
- g_free (child);
- gtk_widget_queue_resize (GTK_WIDGET (container));
- break;
- }
- }
+ GsBox *box = GS_BOX (container);
+ GList *l;
+
+ for (l = box->children; l; l = l->next) {
+ GsBoxChild *child = l->data;
+ if (child->widget == widget) {
+ gtk_widget_unparent (child->widget);
+ box->children = g_list_delete_link (box->children, l);
+ box->total -= child->relative_size;
+ g_free (child);
+ gtk_widget_queue_resize (GTK_WIDGET (container));
+ break;
+ }
+ }
}
static void
gs_box_forall (GtkContainer *container,
- gboolean include_internals,
- GtkCallback callback,
- gpointer callback_data)
+ gboolean include_internals,
+ GtkCallback callback,
+ gpointer callback_data)
{
- GsBox *box = GS_BOX (container);
- GsBoxChild *child;
- GList *children;
-
- children = box->children;
- while (children) {
- child = children->data;
- children = children->next;
- (* callback) (child->widget, callback_data);
- }
+ GsBox *box = GS_BOX (container);
+ GsBoxChild *child;
+ GList *children;
+
+ children = box->children;
+ while (children) {
+ child = children->data;
+ children = children->next;
+ (* callback) (child->widget, callback_data);
+ }
}
static void
gs_box_size_allocate (GtkWidget *widget, GtkAllocation *allocation)
{
- GsBox *box = GS_BOX (widget);
- GsBoxChild *child;
- GtkAllocation child_allocation;
- gint x;
- GList *l;
- gboolean rtl;
-
- rtl = gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL;
-
- gtk_widget_set_allocation (widget, allocation);
-
- x = allocation->x;
- for (l = box->children; l; l = l->next) {
- child = l->data;
- child_allocation.x = x;
- child_allocation.y = allocation->y;
- child_allocation.width = allocation->width * (child->relative_size / box->total);
- child_allocation.height = allocation->height;
- if (rtl) {
- child_allocation.x = allocation->x + allocation->width - child_allocation.x -
child_allocation.width;
- }
- gtk_widget_size_allocate (child->widget, &child_allocation);
- x += child_allocation.width;
- }
+ GsBox *box = GS_BOX (widget);
+ GsBoxChild *child;
+ GtkAllocation child_allocation;
+ gint x;
+ GList *l;
+ gboolean rtl;
+
+ rtl = gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL;
+
+ gtk_widget_set_allocation (widget, allocation);
+
+ x = allocation->x;
+ for (l = box->children; l; l = l->next) {
+ child = l->data;
+ child_allocation.x = x;
+ child_allocation.y = allocation->y;
+ child_allocation.width = allocation->width * (child->relative_size / box->total);
+ child_allocation.height = allocation->height;
+ if (rtl) {
+ child_allocation.x = allocation->x + allocation->width - child_allocation.x -
child_allocation.width;
+ }
+ gtk_widget_size_allocate (child->widget, &child_allocation);
+ x += child_allocation.width;
+ }
}
static void
gs_box_get_preferred_width (GtkWidget *widget, gint *min, gint *nat)
{
- GsBox *box = GS_BOX (widget);
- GsBoxChild *child;
- gint cm, *cn;
- gint n_children;
- gint ms, m, n;
- GList *l;
- gint i;
-
- n_children = g_list_length (box->children);
-
- cn = g_new0 (gint, n_children);
-
- ms = 0;
- for (l = box->children, i = 0; l; l = l->next, i++) {
- child = l->data;
- gtk_widget_get_preferred_width (child->widget, &cm, cn + i);
- ms = MAX (ms, cm / child->relative_size);
- }
-
- m = n = 0;
- for (l = box->children, i = 0; l; l = l->next, i++) {
- cm = ms * child->relative_size;
- m += cm;
- n += MAX (cn[i], cm);
- }
-
- g_free (cn);
-
- if (min)
- *min = m;
- if (nat)
- *nat = n;
+ GsBox *box = GS_BOX (widget);
+ GsBoxChild *child;
+ gint cm, *cn;
+ gint n_children;
+ gint ms, m, n;
+ GList *l;
+ gint i;
+
+ n_children = g_list_length (box->children);
+
+ cn = g_new0 (gint, n_children);
+
+ ms = 0;
+ for (l = box->children, i = 0; l; l = l->next, i++) {
+ child = l->data;
+ gtk_widget_get_preferred_width (child->widget, &cm, cn + i);
+ ms = MAX (ms, cm / child->relative_size);
+ }
+
+ m = n = 0;
+ for (l = box->children, i = 0; l; l = l->next, i++) {
+ cm = ms * child->relative_size;
+ m += cm;
+ n += MAX (cn[i], cm);
+ }
+
+ g_free (cn);
+
+ if (min)
+ *min = m;
+ if (nat)
+ *nat = n;
}
static void
gs_box_get_preferred_height (GtkWidget *widget, gint *min, gint *nat)
{
- GsBox *box = GS_BOX (widget);
- gint m, n;
- gint cm, cn;
- GsBoxChild *child;
- GList *l;
-
- m = n = 0;
- for (l = box->children; l; l = l->next) {
- child = l->data;
- gtk_widget_get_preferred_height (child->widget, &cm, &cn);
- m = MAX (m, cm);
- n = MAX (n, cn);
- }
- if (min)
- *min = m;
- if (nat)
- *nat = n;
+ GsBox *box = GS_BOX (widget);
+ gint m, n;
+ gint cm, cn;
+ GsBoxChild *child;
+ GList *l;
+
+ m = n = 0;
+ for (l = box->children; l; l = l->next) {
+ child = l->data;
+ gtk_widget_get_preferred_height (child->widget, &cm, &cn);
+ m = MAX (m, cm);
+ n = MAX (n, cn);
+ }
+ if (min)
+ *min = m;
+ if (nat)
+ *nat = n;
}
static void
gs_box_get_child_property (GtkContainer *container,
- GtkWidget *widget,
- guint property_id,
- GValue *value,
- GParamSpec *pspec)
+ GtkWidget *widget,
+ guint property_id,
+ GValue *value,
+ GParamSpec *pspec)
{
- GsBox *box = GS_BOX (container);
- GList *l;
- GsBoxChild *child;
-
- child = NULL;
- for (l = box->children; l; l = l->next) {
- child = l->data;
- if (child->widget == widget) {
- break;
- }
- }
- if (child == NULL) {
- GTK_CONTAINER_WARN_INVALID_CHILD_PROPERTY_ID (container, property_id, pspec);
- return;
- }
-
- switch (property_id) {
- case CHILD_PROP_RELATIVE_SIZE:
- g_value_set_double (value, child->relative_size);
- break;
- default:
- GTK_CONTAINER_WARN_INVALID_CHILD_PROPERTY_ID (container, property_id, pspec);
- }
+ GsBox *box = GS_BOX (container);
+ GList *l;
+ GsBoxChild *child;
+
+ child = NULL;
+ for (l = box->children; l; l = l->next) {
+ child = l->data;
+ if (child->widget == widget) {
+ break;
+ }
+ }
+ if (child == NULL) {
+ GTK_CONTAINER_WARN_INVALID_CHILD_PROPERTY_ID (container, property_id, pspec);
+ return;
+ }
+
+ switch (property_id) {
+ case CHILD_PROP_RELATIVE_SIZE:
+ g_value_set_double (value, child->relative_size);
+ break;
+ default:
+ GTK_CONTAINER_WARN_INVALID_CHILD_PROPERTY_ID (container, property_id, pspec);
+ }
}
static void
gs_box_set_child_property (GtkContainer *container,
- GtkWidget *widget,
- guint property_id,
- const GValue *value,
- GParamSpec *pspec)
+ GtkWidget *widget,
+ guint property_id,
+ const GValue *value,
+ GParamSpec *pspec)
{
- GsBox *box = GS_BOX (container);
- GList *l;
- GsBoxChild *child;
-
- child = NULL;
- for (l = box->children; l; l = l->next) {
- child = l->data;
- if (child->widget == widget) {
- break;
- }
- }
- if (child == NULL) {
- GTK_CONTAINER_WARN_INVALID_CHILD_PROPERTY_ID (container, property_id, pspec);
- return;
- }
-
- switch (property_id) {
- case CHILD_PROP_RELATIVE_SIZE:
- box->total -= child->relative_size;
- child->relative_size = g_value_get_double (value);
- box->total += child->relative_size;
- break;
- default:
- GTK_CONTAINER_WARN_INVALID_CHILD_PROPERTY_ID (container, property_id, pspec);
- }
+ GsBox *box = GS_BOX (container);
+ GList *l;
+ GsBoxChild *child;
+
+ child = NULL;
+ for (l = box->children; l; l = l->next) {
+ child = l->data;
+ if (child->widget == widget) {
+ break;
+ }
+ }
+ if (child == NULL) {
+ GTK_CONTAINER_WARN_INVALID_CHILD_PROPERTY_ID (container, property_id, pspec);
+ return;
+ }
+
+ switch (property_id) {
+ case CHILD_PROP_RELATIVE_SIZE:
+ box->total -= child->relative_size;
+ child->relative_size = g_value_get_double (value);
+ box->total += child->relative_size;
+ break;
+ default:
+ GTK_CONTAINER_WARN_INVALID_CHILD_PROPERTY_ID (container, property_id, pspec);
+ }
}
static void
gs_box_init (GsBox *box)
{
- gtk_widget_set_has_window (GTK_WIDGET (box), FALSE);
+ gtk_widget_set_has_window (GTK_WIDGET (box), FALSE);
}
static void
gs_box_class_init (GsBoxClass *class)
{
- GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
- GtkContainerClass *container_class = GTK_CONTAINER_CLASS (class);
-
- widget_class->size_allocate = gs_box_size_allocate;
- widget_class->get_preferred_width = gs_box_get_preferred_width;
- widget_class->get_preferred_height = gs_box_get_preferred_height;
-
- container_class->add = gs_box_real_add;
- container_class->remove = gs_box_remove;
- container_class->forall = gs_box_forall;
- container_class->get_child_property = gs_box_get_child_property;
- container_class->set_child_property = gs_box_set_child_property;
-
- gtk_container_class_install_child_property (container_class,
- CHILD_PROP_RELATIVE_SIZE,
- g_param_spec_double ("relative-size", NULL, NULL,
- 0.0, G_MAXDOUBLE, 1.0,
- G_PARAM_READWRITE));
+ GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
+ GtkContainerClass *container_class = GTK_CONTAINER_CLASS (class);
+
+ widget_class->size_allocate = gs_box_size_allocate;
+ widget_class->get_preferred_width = gs_box_get_preferred_width;
+ widget_class->get_preferred_height = gs_box_get_preferred_height;
+
+ container_class->add = gs_box_real_add;
+ container_class->remove = gs_box_remove;
+ container_class->forall = gs_box_forall;
+ container_class->get_child_property = gs_box_get_child_property;
+ container_class->set_child_property = gs_box_set_child_property;
+
+ gtk_container_class_install_child_property (container_class,
+ CHILD_PROP_RELATIVE_SIZE,
+ g_param_spec_double ("relative-size", NULL, NULL,
+ 0.0, G_MAXDOUBLE, 1.0,
+ G_PARAM_READWRITE));
}
GtkWidget *
gs_box_new (void)
{
- return g_object_new (GS_TYPE_BOX, NULL);
+ return g_object_new (GS_TYPE_BOX, NULL);
}
void
gs_box_add (GsBox *box, GtkWidget *widget, gdouble relative_size)
{
- GsBoxChild *child;
+ GsBoxChild *child;
- child = g_new (GsBoxChild, 1);
+ child = g_new (GsBoxChild, 1);
- child->widget = widget;
- child->relative_size = relative_size;
+ child->widget = widget;
+ child->relative_size = relative_size;
- box->total += relative_size;
+ box->total += relative_size;
- box->children = g_list_append (box->children, child);
- gtk_widget_set_parent (widget, GTK_WIDGET (box));
+ box->children = g_list_append (box->children, child);
+ gtk_widget_set_parent (widget, GTK_WIDGET (box));
}
/* vim: set noexpandtab: */
diff --git a/src/gs-box.h b/src/gs-box.h
index 89518ff..375a2d4 100644
--- a/src/gs-box.h
+++ b/src/gs-box.h
@@ -36,11 +36,11 @@ G_BEGIN_DECLS
typedef struct _GsBox GsBox;
typedef struct _GsBoxClass GsBoxClass;
-GType gs_box_get_type (void);
+GType gs_box_get_type (void);
GtkWidget *gs_box_new (void);
-void gs_box_add (GsBox *box,
- GtkWidget *child,
- gdouble relative_size);
+void gs_box_add (GsBox *box,
+ GtkWidget *child,
+ gdouble relative_size);
G_END_DECLS
diff --git a/src/gs-category-tile.c b/src/gs-category-tile.c
index ce79131..1e957bf 100644
--- a/src/gs-category-tile.c
+++ b/src/gs-category-tile.c
@@ -45,28 +45,28 @@ static guint signals [SIGNAL_LAST] = { 0 };
GsCategory *
gs_category_tile_get_category (GsCategoryTile *tile)
{
- GsCategoryTilePrivate *priv;
+ GsCategoryTilePrivate *priv;
g_return_val_if_fail (GS_IS_CATEGORY_TILE (tile), NULL);
- priv = gs_category_tile_get_instance_private (tile);
+ priv = gs_category_tile_get_instance_private (tile);
return priv->cat;
}
void
gs_category_tile_set_category (GsCategoryTile *tile, GsCategory *cat)
{
- GsCategoryTilePrivate *priv;
+ GsCategoryTilePrivate *priv;
g_return_if_fail (GS_IS_CATEGORY_TILE (tile));
g_return_if_fail (GS_IS_CATEGORY (cat));
- priv = gs_category_tile_get_instance_private (tile);
+ priv = gs_category_tile_get_instance_private (tile);
- g_clear_object (&priv->cat);
+ g_clear_object (&priv->cat);
priv->cat = g_object_ref (cat);
- gtk_label_set_label (GTK_LABEL (priv->label), gs_category_get_name (cat));
+ gtk_label_set_label (GTK_LABEL (priv->label), gs_category_get_name (cat));
}
static void
@@ -75,7 +75,7 @@ gs_category_tile_destroy (GtkWidget *widget)
GsCategoryTile *tile = GS_CATEGORY_TILE (widget);
GsCategoryTilePrivate *priv;
- priv = gs_category_tile_get_instance_private (tile);
+ priv = gs_category_tile_get_instance_private (tile);
g_clear_object (&priv->cat);
@@ -85,19 +85,19 @@ gs_category_tile_destroy (GtkWidget *widget)
static void
button_clicked (GsCategoryTile *tile)
{
- g_signal_emit (tile, signals[SIGNAL_CLICKED], 0);
+ g_signal_emit (tile, signals[SIGNAL_CLICKED], 0);
}
static void
gs_category_tile_init (GsCategoryTile *tile)
{
- GsCategoryTilePrivate *priv;
+ GsCategoryTilePrivate *priv;
- gtk_widget_set_has_window (GTK_WIDGET (tile), FALSE);
- gtk_widget_init_template (GTK_WIDGET (tile));
- priv = gs_category_tile_get_instance_private (tile);
- g_signal_connect_swapped (priv->button, "clicked",
- G_CALLBACK (button_clicked), tile);
+ gtk_widget_set_has_window (GTK_WIDGET (tile), FALSE);
+ gtk_widget_init_template (GTK_WIDGET (tile));
+ priv = gs_category_tile_get_instance_private (tile);
+ g_signal_connect_swapped (priv->button, "clicked",
+ G_CALLBACK (button_clicked), tile);
}
static void
@@ -115,21 +115,21 @@ gs_category_tile_class_init (GsCategoryTileClass *klass)
NULL, NULL, g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
- gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/software/category-tile.ui");
+ gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/software/category-tile.ui");
- gtk_widget_class_bind_template_child_private (widget_class, GsCategoryTile, button);
- gtk_widget_class_bind_template_child_private (widget_class, GsCategoryTile, label);
+ gtk_widget_class_bind_template_child_private (widget_class, GsCategoryTile, button);
+ gtk_widget_class_bind_template_child_private (widget_class, GsCategoryTile, label);
}
GtkWidget *
gs_category_tile_new (GsCategory *cat)
{
- GsCategoryTile *tile;
+ GsCategoryTile *tile;
- tile = g_object_new (GS_TYPE_CATEGORY_TILE, NULL);
- gs_category_tile_set_category (tile, cat);
+ tile = g_object_new (GS_TYPE_CATEGORY_TILE, NULL);
+ gs_category_tile_set_category (tile, cat);
- return GTK_WIDGET (tile);
+ return GTK_WIDGET (tile);
}
/* vim: set noexpandtab: */
diff --git a/src/gs-category-tile.h b/src/gs-category-tile.h
index 3bc29f9..f3fb0a0 100644
--- a/src/gs-category-tile.h
+++ b/src/gs-category-tile.h
@@ -29,7 +29,7 @@
#define GS_TYPE_CATEGORY_TILE (gs_category_tile_get_type())
#define GS_CATEGORY_TILE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GS_TYPE_CATEGORY_TILE,
GsCategoryTile))
#define GS_CATEGORY_TILE_CLASS(cls) (G_TYPE_CHECK_CLASS_CAST((cls), GS_TYPE_CATEGORY_TILE,
GsCategoryTileClass))
-#define GS_IS_CATEGORY_TILE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), GS_TYPE_CATEGORY_TILE))
+#define GS_IS_CATEGORY_TILE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), GS_TYPE_CATEGORY_TILE))
#define GS_IS_CATEGORY_TILE_CLASS(cls) (G_TYPE_CHECK_CLASS_TYPE((cls), GS_TYPE_CATEGORY_TILE))
#define GS_CATEGORY_TILE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GS_TYPE_CATEGORY_TILE,
GsCategoryTileClass))
@@ -41,15 +41,15 @@ typedef struct _GsCategoryTilePrivate GsCategoryTilePrivate;
struct _GsCategoryTile
{
- GtkBin parent;
+ GtkBin parent;
GsCategoryTilePrivate *priv;
};
struct _GsCategoryTileClass
{
- GtkBinClass parent_class;
+ GtkBinClass parent_class;
- void (*clicked) (GsCategoryTile *tile);
+ void (*clicked) (GsCategoryTile *tile);
};
GType gs_category_tile_get_type (void);
diff --git a/src/gs-category.c b/src/gs-category.c
index 43c8e65..8ebe279 100644
--- a/src/gs-category.c
+++ b/src/gs-category.c
@@ -33,8 +33,8 @@ struct GsCategoryPrivate
{
gchar *id;
gchar *name;
- GsCategory *parent;
- GList *subcategories;
+ GsCategory *parent;
+ GList *subcategories;
};
G_DEFINE_TYPE (GsCategory, gs_category, G_TYPE_OBJECT)
@@ -65,21 +65,21 @@ GsCategory *
gs_category_get_parent (GsCategory *category)
{
g_return_val_if_fail (GS_IS_CATEGORY (category), NULL);
- return category->priv->parent;
+ return category->priv->parent;
}
GList *
gs_category_get_subcategories (GsCategory *category)
{
g_return_val_if_fail (GS_IS_CATEGORY (category), NULL);
- return g_list_copy (category->priv->subcategories);
+ return g_list_copy (category->priv->subcategories);
}
void
gs_category_add_subcategory (GsCategory *category, GsCategory *subcategory)
{
g_return_if_fail (GS_IS_CATEGORY (category));
- category->priv->subcategories = g_list_prepend (category->priv->subcategories, g_object_ref
(subcategory));
+ category->priv->subcategories = g_list_prepend (category->priv->subcategories, g_object_ref
(subcategory));
}
/**
@@ -146,7 +146,7 @@ gs_category_finalize (GObject *object)
g_free (priv->id);
g_free (priv->name);
- g_list_free_full (priv->subcategories, g_object_unref);
+ g_list_free_full (priv->subcategories, g_object_unref);
G_OBJECT_CLASS (gs_category_parent_class)->finalize (object);
}
@@ -156,9 +156,9 @@ gs_category_new (GsCategory *parent, const gchar *id, const gchar *name)
{
GsCategory *category;
category = g_object_new (GS_TYPE_CATEGORY, NULL);
- category->priv->parent = parent;
- category->priv->id = g_strdup (id);
- category->priv->name = g_strdup (name);
+ category->priv->parent = parent;
+ category->priv->id = g_strdup (id);
+ category->priv->name = g_strdup (name);
return GS_CATEGORY (category);
}
diff --git a/src/gs-category.h b/src/gs-category.h
index 41734b5..b3bbffe 100644
--- a/src/gs-category.h
+++ b/src/gs-category.h
@@ -29,7 +29,7 @@ G_BEGIN_DECLS
#define GS_TYPE_CATEGORY (gs_category_get_type ())
#define GS_CATEGORY(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GS_TYPE_CATEGORY, GsCategory))
#define GS_CATEGORY_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GS_TYPE_CATEGORY, GsCategoryClass))
-#define GS_IS_CATEGORY(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GS_TYPE_CATEGORY))
+#define GS_IS_CATEGORY(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GS_TYPE_CATEGORY))
#define GS_IS_CATEGORY_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GS_TYPE_CATEGORY))
#define GS_CATEGORY_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GS_TYPE_CATEGORY, GsCategoryClass))
@@ -48,19 +48,18 @@ typedef struct
GType gs_category_get_type (void);
-GsCategory *gs_category_new (GsCategory *parent,
- const gchar *id,
- const gchar *name);
-const gchar *gs_category_get_id (GsCategory *category);
-GsCategory *gs_category_get_parent (GsCategory *category);
-const gchar *gs_category_get_name (GsCategory *category);
-void gs_category_set_name (GsCategory *category,
- const gchar *name);
-void gs_category_sort_subcategories (GsCategory *category);
-GList *gs_category_get_subcategories (GsCategory *category);
-void gs_category_add_subcategory (GsCategory *category,
- GsCategory *subcategory);
-
+GsCategory *gs_category_new (GsCategory *parent,
+ const gchar *id,
+ const gchar *name);
+const gchar *gs_category_get_id (GsCategory *category);
+GsCategory *gs_category_get_parent (GsCategory *category);
+const gchar *gs_category_get_name (GsCategory *category);
+void gs_category_set_name (GsCategory *category,
+ const gchar *name);
+void gs_category_sort_subcategories (GsCategory *category);
+GList *gs_category_get_subcategories (GsCategory *category);
+void gs_category_add_subcategory (GsCategory *category,
+ GsCategory *subcategory);
G_END_DECLS
diff --git a/src/gs-feature-tile.c b/src/gs-feature-tile.c
index da6741d..e3d399b 100644
--- a/src/gs-feature-tile.c
+++ b/src/gs-feature-tile.c
@@ -33,7 +33,7 @@ struct _GsFeatureTilePrivate
GtkWidget *image;
GtkWidget *title;
GtkWidget *subtitle;
- GtkCssProvider *provider;
+ GtkCssProvider *provider;
};
G_DEFINE_TYPE_WITH_PRIVATE (GsFeatureTile, gs_feature_tile, GTK_TYPE_BIN)
@@ -48,51 +48,51 @@ static guint signals [SIGNAL_LAST] = { 0 };
GsApp *
gs_feature_tile_get_app (GsFeatureTile *tile)
{
- GsFeatureTilePrivate *priv;
+ GsFeatureTilePrivate *priv;
g_return_val_if_fail (GS_IS_FEATURE_TILE (tile), NULL);
- priv = gs_feature_tile_get_instance_private (tile);
+ priv = gs_feature_tile_get_instance_private (tile);
return priv->app;
}
void
gs_feature_tile_set_app (GsFeatureTile *tile, GsApp *app)
{
- GsFeatureTilePrivate *priv;
- gchar *data;
+ GsFeatureTilePrivate *priv;
+ gchar *data;
g_return_if_fail (GS_IS_FEATURE_TILE (tile));
g_return_if_fail (GS_IS_APP (app));
- priv = gs_feature_tile_get_instance_private (tile);
+ priv = gs_feature_tile_get_instance_private (tile);
- g_clear_object (&priv->app);
+ g_clear_object (&priv->app);
priv->app = g_object_ref (app);
- gtk_label_set_label (GTK_LABEL (priv->title), gs_app_get_name (app));
- gtk_label_set_label (GTK_LABEL (priv->subtitle), gs_app_get_summary (app));
- data = g_strdup_printf (
- ".button.featured-tile {\n"
- " padding: 0;\n"
- " border-radius: 0;\n"
- " border-width: 1px;\n"
- " border-image: none;\n"
- " border-color: %s;\n"
- " color: %s;\n"
- " -GtkWidget-focus-padding: 0;\n"
- " outline-color: alpha(%s, 0.75);\n"
- " outline-style: dashed;\n"
- " outline-offset: 2px;\n"
- " background: %s;\n"
- "}\n",
- gs_app_get_metadata_item (app, "Featured::stroke-color"),
- gs_app_get_metadata_item (app, "Featured::text-color"),
- gs_app_get_metadata_item (app, "Featured::text-color"),
- gs_app_get_metadata_item (app, "Featured::background"));
-
- gtk_css_provider_load_from_data (priv->provider, data, -1, NULL);
- g_free (data);
+ gtk_label_set_label (GTK_LABEL (priv->title), gs_app_get_name (app));
+ gtk_label_set_label (GTK_LABEL (priv->subtitle), gs_app_get_summary (app));
+ data = g_strdup_printf (
+ ".button.featured-tile {\n"
+ " padding: 0;\n"
+ " border-radius: 0;\n"
+ " border-width: 1px;\n"
+ " border-image: none;\n"
+ " border-color: %s;\n"
+ " color: %s;\n"
+ " -GtkWidget-focus-padding: 0;\n"
+ " outline-color: alpha(%s, 0.75);\n"
+ " outline-style: dashed;\n"
+ " outline-offset: 2px;\n"
+ " background: %s;\n"
+ "}\n",
+ gs_app_get_metadata_item (app, "Featured::stroke-color"),
+ gs_app_get_metadata_item (app, "Featured::text-color"),
+ gs_app_get_metadata_item (app, "Featured::text-color"),
+ gs_app_get_metadata_item (app, "Featured::background"));
+
+ gtk_css_provider_load_from_data (priv->provider, data, -1, NULL);
+ g_free (data);
}
static void
@@ -101,7 +101,7 @@ gs_feature_tile_destroy (GtkWidget *widget)
GsFeatureTile *tile = GS_FEATURE_TILE (widget);
GsFeatureTilePrivate *priv;
- priv = gs_feature_tile_get_instance_private (tile);
+ priv = gs_feature_tile_get_instance_private (tile);
g_clear_object (&priv->app);
g_clear_object (&priv->provider);
@@ -112,24 +112,24 @@ gs_feature_tile_destroy (GtkWidget *widget)
static void
button_clicked (GsFeatureTile *tile)
{
- g_signal_emit (tile, signals[SIGNAL_CLICKED], 0);
+ g_signal_emit (tile, signals[SIGNAL_CLICKED], 0);
}
static void
gs_feature_tile_init (GsFeatureTile *tile)
{
- GsFeatureTilePrivate *priv;
-
- gtk_widget_set_has_window (GTK_WIDGET (tile), FALSE);
- gtk_widget_init_template (GTK_WIDGET (tile));
- priv = gs_feature_tile_get_instance_private (tile);
- g_signal_connect_swapped (priv->button, "clicked",
- G_CALLBACK (button_clicked), tile);
-
- priv->provider = gtk_css_provider_new ();
- gtk_style_context_add_provider_for_screen (gdk_screen_get_default (),
- GTK_STYLE_PROVIDER (priv->provider),
- GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+ GsFeatureTilePrivate *priv;
+
+ gtk_widget_set_has_window (GTK_WIDGET (tile), FALSE);
+ gtk_widget_init_template (GTK_WIDGET (tile));
+ priv = gs_feature_tile_get_instance_private (tile);
+ g_signal_connect_swapped (priv->button, "clicked",
+ G_CALLBACK (button_clicked), tile);
+
+ priv->provider = gtk_css_provider_new ();
+ gtk_style_context_add_provider_for_screen (gdk_screen_get_default (),
+ GTK_STYLE_PROVIDER (priv->provider),
+ GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
}
static void
@@ -147,23 +147,23 @@ gs_feature_tile_class_init (GsFeatureTileClass *klass)
NULL, NULL, g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
- gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/software/feature-tile.ui");
+ gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/software/feature-tile.ui");
- gtk_widget_class_bind_template_child_private (widget_class, GsFeatureTile, button);
- gtk_widget_class_bind_template_child_private (widget_class, GsFeatureTile, image);
- gtk_widget_class_bind_template_child_private (widget_class, GsFeatureTile, title);
- gtk_widget_class_bind_template_child_private (widget_class, GsFeatureTile, subtitle);
+ gtk_widget_class_bind_template_child_private (widget_class, GsFeatureTile, button);
+ gtk_widget_class_bind_template_child_private (widget_class, GsFeatureTile, image);
+ gtk_widget_class_bind_template_child_private (widget_class, GsFeatureTile, title);
+ gtk_widget_class_bind_template_child_private (widget_class, GsFeatureTile, subtitle);
}
GtkWidget *
gs_feature_tile_new (GsApp *app)
{
- GsFeatureTile *tile;
+ GsFeatureTile *tile;
- tile = g_object_new (GS_TYPE_FEATURE_TILE, NULL);
- gs_feature_tile_set_app (tile, app);
+ tile = g_object_new (GS_TYPE_FEATURE_TILE, NULL);
+ gs_feature_tile_set_app (tile, app);
- return GTK_WIDGET (tile);
+ return GTK_WIDGET (tile);
}
/* vim: set noexpandtab: */
diff --git a/src/gs-feature-tile.h b/src/gs-feature-tile.h
index 9e887c0..fb1eb79 100644
--- a/src/gs-feature-tile.h
+++ b/src/gs-feature-tile.h
@@ -41,19 +41,19 @@ typedef struct _GsFeatureTilePrivate GsFeatureTilePrivate;
struct _GsFeatureTile
{
- GtkBin parent;
+ GtkBin parent;
GsFeatureTilePrivate *priv;
};
struct _GsFeatureTileClass
{
- GtkBinClass parent_class;
+ GtkBinClass parent_class;
- void (*clicked) (GsFeatureTile *tile);
+ void (*clicked) (GsFeatureTile *tile);
};
GType gs_feature_tile_get_type (void);
-GtkWidget *gs_feature_tile_new (GsApp *app);
+GtkWidget *gs_feature_tile_new (GsApp *app);
GsApp *gs_feature_tile_get_app (GsFeatureTile *tile);
void gs_feature_tile_set_app (GsFeatureTile *tile,
GsApp *app);
diff --git a/src/gs-main.c b/src/gs-main.c
index b3b231f..0155c56 100644
--- a/src/gs-main.c
+++ b/src/gs-main.c
@@ -31,7 +31,7 @@ int
main (int argc, char **argv)
{
int status = 0;
- GsApplication *application;
+ GsApplication *application;
setlocale (LC_ALL, "");
@@ -41,7 +41,7 @@ main (int argc, char **argv)
application = gs_application_new ();
status = g_application_run (G_APPLICATION (application), argc, argv);
- g_object_unref (application);
+ g_object_unref (application);
return status;
}
diff --git a/src/gs-plugin-loader-sync.c b/src/gs-plugin-loader-sync.c
index 5908ec7..d135da1 100644
--- a/src/gs-plugin-loader-sync.c
+++ b/src/gs-plugin-loader-sync.c
@@ -205,12 +205,12 @@ gs_plugin_loader_get_categories (GsPluginLoader *plugin_loader,
static void
gs_plugin_loader_get_category_apps_finish_sync (GsPluginLoader *plugin_loader,
- GAsyncResult *res,
- GsPluginLoaderHelper *helper)
+ GAsyncResult *res,
+ GsPluginLoaderHelper *helper)
{
helper->list = gs_plugin_loader_get_category_apps_finish (plugin_loader,
- res,
- helper->error);
+ res,
+ helper->error);
g_main_loop_quit (helper->loop);
}
diff --git a/src/gs-plugin-loader.c b/src/gs-plugin-loader.c
index d9abebb..caee357 100644
--- a/src/gs-plugin-loader.c
+++ b/src/gs-plugin-loader.c
@@ -36,10 +36,10 @@ struct GsPluginLoaderPrivate
gchar *location;
GsPluginStatus status_last;
- GMutex pending_apps_mutex;
+ GMutex pending_apps_mutex;
GPtrArray *pending_apps;
- GMutex app_cache_mutex;
+ GMutex app_cache_mutex;
GHashTable *app_cache;
};
diff --git a/src/gs-plugin-loader.h b/src/gs-plugin-loader.h
index e889862..274a1f7 100644
--- a/src/gs-plugin-loader.h
+++ b/src/gs-plugin-loader.h
@@ -33,7 +33,7 @@ G_BEGIN_DECLS
#define GS_TYPE_PLUGIN_LOADER (gs_plugin_loader_get_type ())
#define GS_PLUGIN_LOADER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GS_TYPE_PLUGIN_LOADER,
GsPluginLoader))
#define GS_PLUGIN_LOADER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GS_TYPE_PLUGIN_LOADER,
GsPluginLoaderClass))
-#define GS_IS_PLUGIN_LOADER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GS_TYPE_PLUGIN_LOADER))
+#define GS_IS_PLUGIN_LOADER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GS_TYPE_PLUGIN_LOADER))
#define GS_IS_PLUGIN_LOADER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GS_TYPE_PLUGIN_LOADER))
#define GS_PLUGIN_LOADER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GS_TYPE_PLUGIN_LOADER,
GsPluginLoaderClass))
#define GS_PLUGIN_LOADER_ERROR (gs_plugin_loader_error_quark ())
diff --git a/src/gs-popular-tile.c b/src/gs-popular-tile.c
index e82fd5c..ec67b0d 100644
--- a/src/gs-popular-tile.c
+++ b/src/gs-popular-tile.c
@@ -47,64 +47,64 @@ static guint signals [SIGNAL_LAST] = { 0 };
GsApp *
gs_popular_tile_get_app (GsPopularTile *tile)
{
- GsPopularTilePrivate *priv;
+ GsPopularTilePrivate *priv;
g_return_val_if_fail (GS_IS_POPULAR_TILE (tile), NULL);
- priv = gs_popular_tile_get_instance_private (tile);
+ priv = gs_popular_tile_get_instance_private (tile);
return priv->app;
}
static gboolean
transform_state_func (GBinding *binding,
- const GValue *source,
- GValue *target,
- gpointer user_data)
+ const GValue *source,
+ GValue *target,
+ gpointer user_data)
{
- GsAppState state;
- gboolean installed;
-
- state = g_value_get_uint (source);
-
- switch (state) {
- case GS_APP_STATE_INSTALLED:
- case GS_APP_STATE_INSTALLING:
- case GS_APP_STATE_REMOVING:
- case GS_APP_STATE_UPDATABLE:
- installed = TRUE;
- break;
- case GS_APP_STATE_AVAILABLE:
- default:
- installed = FALSE;
- break;
- }
- g_value_set_boolean (target, installed);
-
- return TRUE;
+ GsAppState state;
+ gboolean installed;
+
+ state = g_value_get_uint (source);
+
+ switch (state) {
+ case GS_APP_STATE_INSTALLED:
+ case GS_APP_STATE_INSTALLING:
+ case GS_APP_STATE_REMOVING:
+ case GS_APP_STATE_UPDATABLE:
+ installed = TRUE;
+ break;
+ case GS_APP_STATE_AVAILABLE:
+ default:
+ installed = FALSE;
+ break;
+ }
+ g_value_set_boolean (target, installed);
+
+ return TRUE;
}
void
gs_popular_tile_set_app (GsPopularTile *tile, GsApp *app)
{
- GsPopularTilePrivate *priv;
+ GsPopularTilePrivate *priv;
g_return_if_fail (GS_IS_POPULAR_TILE (tile));
g_return_if_fail (GS_IS_APP (app));
- priv = gs_popular_tile_get_instance_private (tile);
+ priv = gs_popular_tile_get_instance_private (tile);
- g_clear_object (&priv->app);
+ g_clear_object (&priv->app);
priv->app = g_object_ref (app);
- g_object_bind_property_full (priv->app, "state",
- priv->eventbox, "visible",
- G_BINDING_SYNC_CREATE,
- transform_state_func,
- NULL, NULL, NULL);
+ g_object_bind_property_full (priv->app, "state",
+ priv->eventbox, "visible",
+ G_BINDING_SYNC_CREATE,
+ transform_state_func,
+ NULL, NULL, NULL);
- gtk_image_set_from_pixbuf (GTK_IMAGE (priv->image), gs_app_get_pixbuf (priv->app));
+ gtk_image_set_from_pixbuf (GTK_IMAGE (priv->image), gs_app_get_pixbuf (priv->app));
- gtk_label_set_label (GTK_LABEL (priv->label), gs_app_get_name (app));
+ gtk_label_set_label (GTK_LABEL (priv->label), gs_app_get_name (app));
}
static void
@@ -113,7 +113,7 @@ gs_popular_tile_destroy (GtkWidget *widget)
GsPopularTile *tile = GS_POPULAR_TILE (widget);
GsPopularTilePrivate *priv;
- priv = gs_popular_tile_get_instance_private (tile);
+ priv = gs_popular_tile_get_instance_private (tile);
g_clear_object (&priv->app);
@@ -123,19 +123,19 @@ gs_popular_tile_destroy (GtkWidget *widget)
static void
button_clicked (GsPopularTile *tile)
{
- g_signal_emit (tile, signals[SIGNAL_CLICKED], 0);
+ g_signal_emit (tile, signals[SIGNAL_CLICKED], 0);
}
static void
gs_popular_tile_init (GsPopularTile *tile)
{
- GsPopularTilePrivate *priv;
+ GsPopularTilePrivate *priv;
- gtk_widget_set_has_window (GTK_WIDGET (tile), FALSE);
- gtk_widget_init_template (GTK_WIDGET (tile));
- priv = gs_popular_tile_get_instance_private (tile);
- g_signal_connect_swapped (priv->button, "clicked",
- G_CALLBACK (button_clicked), tile);
+ gtk_widget_set_has_window (GTK_WIDGET (tile), FALSE);
+ gtk_widget_init_template (GTK_WIDGET (tile));
+ priv = gs_popular_tile_get_instance_private (tile);
+ g_signal_connect_swapped (priv->button, "clicked",
+ G_CALLBACK (button_clicked), tile);
}
static void
@@ -153,23 +153,23 @@ gs_popular_tile_class_init (GsPopularTileClass *klass)
NULL, NULL, g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
- gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/software/popular-tile.ui");
+ gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/software/popular-tile.ui");
- gtk_widget_class_bind_template_child_private (widget_class, GsPopularTile, button);
- gtk_widget_class_bind_template_child_private (widget_class, GsPopularTile, label);
- gtk_widget_class_bind_template_child_private (widget_class, GsPopularTile, image);
- gtk_widget_class_bind_template_child_private (widget_class, GsPopularTile, eventbox);
+ gtk_widget_class_bind_template_child_private (widget_class, GsPopularTile, button);
+ gtk_widget_class_bind_template_child_private (widget_class, GsPopularTile, label);
+ gtk_widget_class_bind_template_child_private (widget_class, GsPopularTile, image);
+ gtk_widget_class_bind_template_child_private (widget_class, GsPopularTile, eventbox);
}
GtkWidget *
gs_popular_tile_new (GsApp *app)
{
- GsPopularTile *tile;
+ GsPopularTile *tile;
- tile = g_object_new (GS_TYPE_POPULAR_TILE, NULL);
- gs_popular_tile_set_app (tile, app);
+ tile = g_object_new (GS_TYPE_POPULAR_TILE, NULL);
+ gs_popular_tile_set_app (tile, app);
- return GTK_WIDGET (tile);
+ return GTK_WIDGET (tile);
}
/* vim: set noexpandtab: */
diff --git a/src/gs-popular-tile.h b/src/gs-popular-tile.h
index eac2b34..9402100 100644
--- a/src/gs-popular-tile.h
+++ b/src/gs-popular-tile.h
@@ -41,19 +41,19 @@ typedef struct _GsPopularTilePrivate GsPopularTilePrivate;
struct _GsPopularTile
{
- GtkBin parent;
+ GtkBin parent;
GsPopularTilePrivate *priv;
};
struct _GsPopularTileClass
{
- GtkBinClass parent_class;
+ GtkBinClass parent_class;
- void (*clicked) (GsPopularTile *tile);
+ void (*clicked) (GsPopularTile *tile);
};
GType gs_popular_tile_get_type (void);
-GtkWidget *gs_popular_tile_new (GsApp *app);
+GtkWidget *gs_popular_tile_new (GsApp *app);
GsApp *gs_popular_tile_get_app (GsPopularTile *tile);
void gs_popular_tile_set_app (GsPopularTile *tile,
GsApp *app);
@@ -62,5 +62,4 @@ G_END_DECLS
#endif /* GS_POPULAR_TILE_H */
-
/* vim: set noexpandtab: */
diff --git a/src/gs-shell-category.c b/src/gs-shell-category.c
index c19be1c..37a5d2a 100644
--- a/src/gs-shell-category.c
+++ b/src/gs-shell-category.c
@@ -29,13 +29,13 @@
#include "gs-shell-category.h"
struct GsShellCategoryPrivate {
- GsPluginLoader *plugin_loader;
- GtkBuilder *builder;
- GCancellable *cancellable;
- GsShell *shell;
- GsCategory *category;
- GtkWidget *col0_placeholder;
- GtkWidget *col1_placeholder;
+ GsPluginLoader *plugin_loader;
+ GtkBuilder *builder;
+ GCancellable *cancellable;
+ GsShell *shell;
+ GsCategory *category;
+ GtkWidget *col0_placeholder;
+ GtkWidget *col1_placeholder;
};
G_DEFINE_TYPE (GsShellCategory, gs_shell_category, G_TYPE_OBJECT)
@@ -44,27 +44,27 @@ void
gs_shell_category_refresh (GsShellCategory *shell)
{
GsShellCategoryPrivate *priv = shell->priv;
- GtkWidget *widget;
- GsCategory *category;
-
- widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "button_back"));
- gtk_widget_show (widget);
- widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "application_details_header"));
- gtk_widget_show (widget);
- category = priv->category;
- if (gs_category_get_parent (category))
- category = gs_category_get_parent (category);
- gtk_label_set_label (GTK_LABEL (widget), gs_category_get_name (category));
+ GtkWidget *widget;
+ GsCategory *category;
+
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "button_back"));
+ gtk_widget_show (widget);
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "application_details_header"));
+ gtk_widget_show (widget);
+ category = priv->category;
+ if (gs_category_get_parent (category))
+ category = gs_category_get_parent (category);
+ gtk_label_set_label (GTK_LABEL (widget), gs_category_get_name (category));
}
static void
app_tile_clicked (GsAppTile *tile, gpointer data)
{
- GsShellCategory *shell = GS_SHELL_CATEGORY (data);
- GsApp *app;
+ GsShellCategory *shell = GS_SHELL_CATEGORY (data);
+ GsApp *app;
- app = gs_app_tile_get_app (tile);
- gs_shell_show_app (shell->priv->shell, app);
+ app = gs_app_tile_get_app (tile);
+ gs_shell_show_app (shell->priv->shell, app);
}
/**
@@ -72,44 +72,44 @@ app_tile_clicked (GsAppTile *tile, gpointer data)
**/
static void
gs_shell_category_get_apps_cb (GObject *source_object,
- GAsyncResult *res,
- gpointer user_data)
+ GAsyncResult *res,
+ gpointer user_data)
{
- GError *error = NULL;
- gint i = 0;
- GList *l;
- GList *list;
- GsApp *app;
- GtkWidget *grid;
- GtkWidget *tile;
- GsShellCategory *shell = GS_SHELL_CATEGORY (user_data);
- GsShellCategoryPrivate *priv = shell->priv;
- GsPluginLoader *plugin_loader = GS_PLUGIN_LOADER (source_object);
-
- list = gs_plugin_loader_get_category_apps_finish (plugin_loader,
- res,
- &error);
+ GError *error = NULL;
+ gint i = 0;
+ GList *l;
+ GList *list;
+ GsApp *app;
+ GtkWidget *grid;
+ GtkWidget *tile;
+ GsShellCategory *shell = GS_SHELL_CATEGORY (user_data);
+ GsShellCategoryPrivate *priv = shell->priv;
+ GsPluginLoader *plugin_loader = GS_PLUGIN_LOADER (source_object);
+
+ list = gs_plugin_loader_get_category_apps_finish (plugin_loader,
+ res,
+ &error);
if (list == NULL) {
- if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
- g_warning ("failed to get apps for category apps: %s", error->message);
- }
+ if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
+ g_warning ("failed to get apps for category apps: %s", error->message);
+ }
g_error_free (error);
goto out;
}
- grid = GTK_WIDGET (gtk_builder_get_object (priv->builder, "category_detail_grid"));
- gtk_grid_remove_column (GTK_GRID (grid), 1);
- gtk_grid_remove_column (GTK_GRID (grid), 0);
-
- for (l = list, i = 0; l != NULL; l = l->next, i++) {
- app = GS_APP (l->data);
- tile = gs_app_tile_new (app);
- g_signal_connect (tile, "clicked",
- G_CALLBACK (app_tile_clicked), shell);
- gtk_grid_attach (GTK_GRID (grid), tile, (i % 2), i / 2, 1, 1);
- }
+ grid = GTK_WIDGET (gtk_builder_get_object (priv->builder, "category_detail_grid"));
+ gtk_grid_remove_column (GTK_GRID (grid), 1);
+ gtk_grid_remove_column (GTK_GRID (grid), 0);
+
+ for (l = list, i = 0; l != NULL; l = l->next, i++) {
+ app = GS_APP (l->data);
+ tile = gs_app_tile_new (app);
+ g_signal_connect (tile, "clicked",
+ G_CALLBACK (app_tile_clicked), shell);
+ gtk_grid_attach (GTK_GRID (grid), tile, (i % 2), i / 2, 1, 1);
+ }
- if (i == 1)
- gtk_grid_attach (GTK_GRID (grid), priv->col1_placeholder, 1, 0, 1, 1);
+ if (i == 1)
+ gtk_grid_attach (GTK_GRID (grid), priv->col1_placeholder, 1, 0, 1, 1);
out:
g_list_free (list);
@@ -119,160 +119,159 @@ out:
static void
gs_shell_category_populate_filtered (GsShellCategory *shell)
{
- GsShellCategoryPrivate *priv = shell->priv;
- GtkWidget *grid;
- GsCategory *parent;
-
- g_cancellable_cancel (priv->cancellable);
- g_cancellable_reset (priv->cancellable);
-
- parent = gs_category_get_parent (priv->category);
- if (parent == NULL) {
- g_debug ("search using %s",
- gs_category_get_id (priv->category));
- } else {
- g_debug ("search using %s/%s",
- gs_category_get_id (parent),
- gs_category_get_id (priv->category));
- }
-
- grid = GTK_WIDGET (gtk_builder_get_object (priv->builder, "category_detail_grid"));
- gtk_grid_remove_column (GTK_GRID (grid), 1);
- gtk_grid_remove_column (GTK_GRID (grid), 0);
-
- gtk_grid_attach (GTK_GRID (grid), priv->col0_placeholder, 0, 0, 1, 1);
- gtk_grid_attach (GTK_GRID (grid), priv->col1_placeholder, 1, 0, 1, 1);
-
- gs_plugin_loader_get_category_apps_async (priv->plugin_loader,
- priv->category,
- priv->cancellable,
- gs_shell_category_get_apps_cb,
- shell);
+ GsShellCategoryPrivate *priv = shell->priv;
+ GtkWidget *grid;
+ GsCategory *parent;
+
+ g_cancellable_cancel (priv->cancellable);
+ g_cancellable_reset (priv->cancellable);
+
+ parent = gs_category_get_parent (priv->category);
+ if (parent == NULL) {
+ g_debug ("search using %s",
+ gs_category_get_id (priv->category));
+ } else {
+ g_debug ("search using %s/%s",
+ gs_category_get_id (parent),
+ gs_category_get_id (priv->category));
+ }
+
+ grid = GTK_WIDGET (gtk_builder_get_object (priv->builder, "category_detail_grid"));
+ gtk_grid_remove_column (GTK_GRID (grid), 1);
+ gtk_grid_remove_column (GTK_GRID (grid), 0);
+
+ gtk_grid_attach (GTK_GRID (grid), priv->col0_placeholder, 0, 0, 1, 1);
+ gtk_grid_attach (GTK_GRID (grid), priv->col1_placeholder, 1, 0, 1, 1);
+
+ gs_plugin_loader_get_category_apps_async (priv->plugin_loader,
+ priv->category,
+ priv->cancellable,
+ gs_shell_category_get_apps_cb,
+ shell);
}
static void
add_separator (GtkListBoxRow *row, GtkListBoxRow *before, gpointer data)
{
- if (!before) {
- return;
- }
+ if (!before) {
+ return;
+ }
- gtk_list_box_row_set_header (row, gtk_separator_new (GTK_ORIENTATION_HORIZONTAL));
+ gtk_list_box_row_set_header (row, gtk_separator_new (GTK_ORIENTATION_HORIZONTAL));
}
static void
filter_selected (GtkListBox *filters, GtkListBoxRow *row, gpointer data)
{
- GsShellCategory *shell = GS_SHELL_CATEGORY (data);
- GsCategory *category;
+ GsShellCategory *shell = GS_SHELL_CATEGORY (data);
+ GsCategory *category;
- if (row == NULL)
- return;
+ if (row == NULL)
+ return;
- category = g_object_get_data (G_OBJECT (gtk_bin_get_child (GTK_BIN (row))), "category");
- g_clear_object (&shell->priv->category);
- shell->priv->category = g_object_ref (category);
- gs_shell_category_populate_filtered (shell);
+ category = g_object_get_data (G_OBJECT (gtk_bin_get_child (GTK_BIN (row))), "category");
+ g_clear_object (&shell->priv->category);
+ shell->priv->category = g_object_ref (category);
+ gs_shell_category_populate_filtered (shell);
}
static void
gs_shell_category_create_filter_list (GsShellCategory *shell, GsCategory *category, GsCategory *subcategory)
{
- GsShellCategoryPrivate *priv = shell->priv;
- GtkWidget *grid;
- GtkWidget *list_box;
- GtkWidget *row;
- GList *list, *l;
- GsCategory *s;
- GtkWidget *frame, *swin;
-
- grid = GTK_WIDGET (gtk_builder_get_object (priv->builder, "category_detail_grid"));
- gs_container_remove_all (GTK_CONTAINER (grid));
-
-
- frame = GTK_WIDGET (gtk_builder_get_object (priv->builder, "frame_filter"));
- swin = GTK_WIDGET (gtk_builder_get_object (priv->builder, "scrolledwindow_filter"));
- gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
- gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (swin), GTK_SHADOW_NONE);
-
- list = gs_category_get_subcategories (category);
- if (!list)
- return;
-
- gtk_grid_attach (GTK_GRID (grid), priv->col0_placeholder, 0, 0, 1, 1);
- gtk_grid_attach (GTK_GRID (grid), priv->col1_placeholder, 1, 0, 1, 1);
-
- list_box = GTK_WIDGET (gtk_builder_get_object (priv->builder, "listbox_filter"));
- gs_container_remove_all (GTK_CONTAINER (list_box));
-
- for (l = list; l; l = l->next) {
- s = l->data;
- row = gtk_label_new (gs_category_get_name (s));
- g_object_set_data_full (G_OBJECT (row), "category", g_object_ref (s), g_object_unref);
- g_object_set (row, "xalign", 0.0, "margin", 6, NULL);
- gtk_widget_show (row);
- gtk_list_box_insert (GTK_LIST_BOX (list_box), row, -1);
- if (subcategory == s)
- gtk_list_box_select_row (GTK_LIST_BOX (list_box), GTK_LIST_BOX_ROW
(gtk_widget_get_parent (row)));
- }
- g_list_free (list);
+ GsShellCategoryPrivate *priv = shell->priv;
+ GtkWidget *grid;
+ GtkWidget *list_box;
+ GtkWidget *row;
+ GList *list, *l;
+ GsCategory *s;
+ GtkWidget *frame, *swin;
+
+ grid = GTK_WIDGET (gtk_builder_get_object (priv->builder, "category_detail_grid"));
+ gs_container_remove_all (GTK_CONTAINER (grid));
+
+ frame = GTK_WIDGET (gtk_builder_get_object (priv->builder, "frame_filter"));
+ swin = GTK_WIDGET (gtk_builder_get_object (priv->builder, "scrolledwindow_filter"));
+ gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
+ gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (swin), GTK_SHADOW_NONE);
+
+ list = gs_category_get_subcategories (category);
+ if (!list)
+ return;
+
+ gtk_grid_attach (GTK_GRID (grid), priv->col0_placeholder, 0, 0, 1, 1);
+ gtk_grid_attach (GTK_GRID (grid), priv->col1_placeholder, 1, 0, 1, 1);
+
+ list_box = GTK_WIDGET (gtk_builder_get_object (priv->builder, "listbox_filter"));
+ gs_container_remove_all (GTK_CONTAINER (list_box));
+
+ for (l = list; l; l = l->next) {
+ s = l->data;
+ row = gtk_label_new (gs_category_get_name (s));
+ g_object_set_data_full (G_OBJECT (row), "category", g_object_ref (s), g_object_unref);
+ g_object_set (row, "xalign", 0.0, "margin", 6, NULL);
+ gtk_widget_show (row);
+ gtk_list_box_insert (GTK_LIST_BOX (list_box), row, -1);
+ if (subcategory == s)
+ gtk_list_box_select_row (GTK_LIST_BOX (list_box), GTK_LIST_BOX_ROW
(gtk_widget_get_parent (row)));
+ }
+ g_list_free (list);
}
void
gs_shell_category_set_category (GsShellCategory *shell, GsCategory *category)
{
- GsShellCategoryPrivate *priv = shell->priv;
- GsCategory *sub;
- GsCategory *selected = NULL;
- GList *list;
- GList *l;
-
- /* this means we've come from the app-view -> back */
- if (gs_category_get_parent (category) != NULL)
- return;
-
- /* select favourites by default */
- list = gs_category_get_subcategories (category);
- for (l = list; l != NULL; l = l->next) {
- sub = GS_CATEGORY (l->data);
- if (g_strcmp0 (gs_category_get_id (sub), "favourites") == 0) {
- selected = sub;
- break;
- }
- }
-
- /* okay, no favourites, so just select the first entry */
- if (selected == NULL && list != NULL)
- selected = GS_CATEGORY (list->data);
-
- /* save this */
- g_clear_object (&priv->category);
- priv->category = g_object_ref (selected);
-
- /* find apps in this group */
- gs_shell_category_create_filter_list (shell, category, selected);
- g_list_free (list);
+ GsShellCategoryPrivate *priv = shell->priv;
+ GsCategory *sub;
+ GsCategory *selected = NULL;
+ GList *list;
+ GList *l;
+
+ /* this means we've come from the app-view -> back */
+ if (gs_category_get_parent (category) != NULL)
+ return;
+
+ /* select favourites by default */
+ list = gs_category_get_subcategories (category);
+ for (l = list; l != NULL; l = l->next) {
+ sub = GS_CATEGORY (l->data);
+ if (g_strcmp0 (gs_category_get_id (sub), "favourites") == 0) {
+ selected = sub;
+ break;
+ }
+ }
+
+ /* okay, no favourites, so just select the first entry */
+ if (selected == NULL && list != NULL)
+ selected = GS_CATEGORY (list->data);
+
+ /* save this */
+ g_clear_object (&priv->category);
+ priv->category = g_object_ref (selected);
+
+ /* find apps in this group */
+ gs_shell_category_create_filter_list (shell, category, selected);
+ g_list_free (list);
}
GsCategory *
gs_shell_category_get_category (GsShellCategory *shell)
{
- return shell->priv->category;
+ return shell->priv->category;
}
static void
gs_shell_category_init (GsShellCategory *shell)
{
- GsShellCategoryPrivate *priv;
+ GsShellCategoryPrivate *priv;
priv = G_TYPE_INSTANCE_GET_PRIVATE (shell, GS_TYPE_SHELL_CATEGORY, GsShellCategoryPrivate);
- shell->priv = priv;
+ shell->priv = priv;
- priv->col0_placeholder = g_object_ref_sink (gtk_label_new (""));
- priv->col1_placeholder = g_object_ref_sink (gtk_label_new (""));
+ priv->col0_placeholder = g_object_ref_sink (gtk_label_new (""));
+ priv->col1_placeholder = g_object_ref_sink (gtk_label_new (""));
- gtk_widget_show (priv->col0_placeholder);
- gtk_widget_show (priv->col1_placeholder);
+ gtk_widget_show (priv->col0_placeholder);
+ gtk_widget_show (priv->col1_placeholder);
}
static void
@@ -282,11 +281,11 @@ gs_shell_category_finalize (GObject *object)
GsShellCategoryPrivate *priv = shell->priv;
g_clear_object (&priv->builder);
- g_clear_object (&priv->category);
+ g_clear_object (&priv->category);
g_clear_object (&priv->plugin_loader);
g_clear_object (&priv->cancellable);
- g_clear_object (&priv->col0_placeholder);
- g_clear_object (&priv->col1_placeholder);
+ g_clear_object (&priv->col0_placeholder);
+ g_clear_object (&priv->col1_placeholder);
G_OBJECT_CLASS (gs_shell_category_parent_class)->finalize (object);
}
@@ -304,43 +303,43 @@ gs_shell_category_class_init (GsShellCategoryClass *klass)
static void
scrollbar_mapped_cb (GtkWidget *sb, GtkScrolledWindow *swin)
{
- GtkWidget *frame;
-
- frame = gtk_bin_get_child (GTK_BIN (gtk_bin_get_child (GTK_BIN (swin))));
- if (gtk_widget_get_mapped (GTK_WIDGET (sb))) {
- gtk_scrolled_window_set_shadow_type (swin, GTK_SHADOW_IN);
- gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_NONE);
- }
- else {
- gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
- gtk_scrolled_window_set_shadow_type (swin, GTK_SHADOW_NONE);
- }
+ GtkWidget *frame;
+
+ frame = gtk_bin_get_child (GTK_BIN (gtk_bin_get_child (GTK_BIN (swin))));
+ if (gtk_widget_get_mapped (GTK_WIDGET (sb))) {
+ gtk_scrolled_window_set_shadow_type (swin, GTK_SHADOW_IN);
+ gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_NONE);
+ }
+ else {
+ gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
+ gtk_scrolled_window_set_shadow_type (swin, GTK_SHADOW_NONE);
+ }
}
void
gs_shell_category_setup (GsShellCategory *shell_category,
- GsShell *shell,
- GsPluginLoader *plugin_loader,
- GtkBuilder *builder,
- GCancellable *cancellable)
+ GsShell *shell,
+ GsPluginLoader *plugin_loader,
+ GtkBuilder *builder,
+ GCancellable *cancellable)
{
GsShellCategoryPrivate *priv = shell_category->priv;
- GtkWidget *widget;
- GtkWidget *sw;
+ GtkWidget *widget;
+ GtkWidget *sw;
priv->plugin_loader = g_object_ref (plugin_loader);
- priv->builder = g_object_ref (builder);
+ priv->builder = g_object_ref (builder);
priv->cancellable = g_cancellable_new ();
- priv->shell = shell;
+ priv->shell = shell;
- widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "listbox_filter"));
- g_signal_connect (widget, "row-selected", G_CALLBACK (filter_selected), shell_category);
- gtk_list_box_set_header_func (GTK_LIST_BOX (widget), add_separator, NULL, NULL);
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "listbox_filter"));
+ g_signal_connect (widget, "row-selected", G_CALLBACK (filter_selected), shell_category);
+ gtk_list_box_set_header_func (GTK_LIST_BOX (widget), add_separator, NULL, NULL);
- sw = GTK_WIDGET (gtk_builder_get_object (priv->builder, "scrolledwindow_filter"));
- widget = gtk_scrolled_window_get_vscrollbar (GTK_SCROLLED_WINDOW (sw));
- g_signal_connect (widget, "map", G_CALLBACK (scrollbar_mapped_cb), sw);
- g_signal_connect (widget, "unmap", G_CALLBACK (scrollbar_mapped_cb), sw);
+ sw = GTK_WIDGET (gtk_builder_get_object (priv->builder, "scrolledwindow_filter"));
+ widget = gtk_scrolled_window_get_vscrollbar (GTK_SCROLLED_WINDOW (sw));
+ g_signal_connect (widget, "map", G_CALLBACK (scrollbar_mapped_cb), sw);
+ g_signal_connect (widget, "unmap", G_CALLBACK (scrollbar_mapped_cb), sw);
}
GsShellCategory *
diff --git a/src/gs-shell-category.h b/src/gs-shell-category.h
index ffee83d..f436400 100644
--- a/src/gs-shell-category.h
+++ b/src/gs-shell-category.h
@@ -54,15 +54,15 @@ typedef struct
GType gs_shell_category_get_type (void);
GsShellCategory *gs_shell_category_new (void);
-void gs_shell_category_set_category (GsShellCategory *shell_category,
- GsCategory *category);
-GsCategory *gs_shell_category_get_category (GsShellCategory *shell_category);
-void gs_shell_category_refresh (GsShellCategory *shell_category);
-void gs_shell_category_setup (GsShellCategory *shell_category,
- GsShell *shell,
- GsPluginLoader *plugin_loader,
- GtkBuilder *builder,
- GCancellable *cancellable);
+void gs_shell_category_set_category (GsShellCategory *shell_category,
+ GsCategory *category);
+GsCategory *gs_shell_category_get_category (GsShellCategory *shell_category);
+void gs_shell_category_refresh (GsShellCategory *shell_category);
+void gs_shell_category_setup (GsShellCategory *shell_category,
+ GsShell *shell,
+ GsPluginLoader *plugin_loader,
+ GtkBuilder *builder,
+ GCancellable *cancellable);
#endif /* __GS_SHELL_CATEGORY_H */
diff --git a/src/gs-shell-details.c b/src/gs-shell-details.c
index 7b047b9..a0d10b3 100644
--- a/src/gs-shell-details.c
+++ b/src/gs-shell-details.c
@@ -39,7 +39,7 @@ struct GsShellDetailsPrivate
GCancellable *cancellable;
gboolean cache_valid;
GsApp *app;
- GsShell *shell;
+ GsShell *shell;
};
G_DEFINE_TYPE (GsShellDetails, gs_shell_details, G_TYPE_OBJECT)
@@ -64,13 +64,13 @@ gs_shell_details_refresh (GsShellDetails *shell_details)
GsAppState state;
GtkWidget *widget;
- if (gs_shell_get_mode (priv->shell) != GS_SHELL_MODE_DETAILS)
- return;
+ if (gs_shell_get_mode (priv->shell) != GS_SHELL_MODE_DETAILS)
+ return;
- widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "application_details_header"));
- gtk_widget_show (widget);
- widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "button_back"));
- gtk_widget_show (widget);
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "application_details_header"));
+ gtk_widget_show (widget);
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "button_back"));
+ gtk_widget_show (widget);
kind = gs_app_get_kind (priv->app);
state = gs_app_get_state (priv->app);
@@ -81,13 +81,13 @@ gs_shell_details_refresh (GsShellDetails *shell_details)
case GS_APP_STATE_AVAILABLE:
gtk_widget_set_visible (widget, TRUE);
gtk_widget_set_sensitive (widget, TRUE);
- gtk_style_context_add_class (gtk_widget_get_style_context (widget), "suggested-action");
+ gtk_style_context_add_class (gtk_widget_get_style_context (widget), "suggested-action");
gtk_button_set_label (GTK_BUTTON (widget), _("Install"));
break;
case GS_APP_STATE_INSTALLING:
gtk_widget_set_visible (widget, TRUE);
gtk_widget_set_sensitive (widget, FALSE);
- gtk_style_context_remove_class (gtk_widget_get_style_context (widget), "suggested-action");
+ gtk_style_context_remove_class (gtk_widget_get_style_context (widget), "suggested-action");
gtk_button_set_label (GTK_BUTTON (widget), _("Installing"));
break;
case GS_APP_STATE_INSTALLED:
@@ -110,13 +110,13 @@ gs_shell_details_refresh (GsShellDetails *shell_details)
case GS_APP_STATE_INSTALLED:
gtk_widget_set_visible (widget, TRUE);
gtk_widget_set_sensitive (widget, TRUE);
- gtk_style_context_add_class (gtk_widget_get_style_context (widget),
"destructive-action");
+ gtk_style_context_add_class (gtk_widget_get_style_context (widget),
"destructive-action");
gtk_button_set_label (GTK_BUTTON (widget), _("Remove"));
break;
case GS_APP_STATE_REMOVING:
gtk_widget_set_visible (widget, TRUE);
gtk_widget_set_sensitive (widget, FALSE);
- gtk_style_context_remove_class (gtk_widget_get_style_context (widget),
"destructive-action");
+ gtk_style_context_remove_class (gtk_widget_get_style_context (widget),
"destructive-action");
gtk_button_set_label (GTK_BUTTON (widget), _("Removing"));
break;
case GS_APP_STATE_UPDATABLE:
@@ -131,30 +131,30 @@ gs_shell_details_refresh (GsShellDetails *shell_details)
}
}
- /* spinner */
+ /* spinner */
widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "header_spinner"));
- if (kind == GS_APP_KIND_SYSTEM) {
+ if (kind == GS_APP_KIND_SYSTEM) {
gtk_widget_set_visible (widget, FALSE);
- gtk_spinner_stop (GTK_SPINNER (widget));
- } else {
- switch (state) {
- case GS_APP_STATE_INSTALLED:
- case GS_APP_STATE_AVAILABLE:
+ gtk_spinner_stop (GTK_SPINNER (widget));
+ } else {
+ switch (state) {
+ case GS_APP_STATE_INSTALLED:
+ case GS_APP_STATE_AVAILABLE:
case GS_APP_STATE_UPDATABLE:
- gtk_widget_set_visible (widget, FALSE);
- gtk_spinner_stop (GTK_SPINNER (widget));
- break;
- case GS_APP_STATE_INSTALLING:
- case GS_APP_STATE_REMOVING:
- gtk_spinner_start (GTK_SPINNER (widget));
- gtk_widget_set_visible (widget, TRUE);
- break;
+ gtk_widget_set_visible (widget, FALSE);
+ gtk_spinner_stop (GTK_SPINNER (widget));
+ break;
+ case GS_APP_STATE_INSTALLING:
+ case GS_APP_STATE_REMOVING:
+ gtk_spinner_start (GTK_SPINNER (widget));
+ gtk_widget_set_visible (widget, TRUE);
+ break;
default:
g_warning ("App unexpectedly in state %s",
gs_app_state_to_string (state));
g_assert_not_reached ();
- }
- }
+ }
+ }
}
/**
@@ -243,7 +243,7 @@ gs_shell_details_set_app (GsShellDetails *shell_details, GsApp *app)
GsApp *
gs_shell_details_get_app (GsShellDetails *shell_details)
{
- return shell_details->priv->app;
+ return shell_details->priv->app;
}
static void
@@ -252,9 +252,9 @@ gs_shell_details_installed_func (GsPluginLoader *plugin_loader, GsApp *app, gpoi
GsShellDetails *shell_details = GS_SHELL_DETAILS (user_data);
gs_shell_details_refresh (shell_details);
- if (app) {
- gs_app_notify_installed (app);
- }
+ if (app) {
+ gs_app_notify_installed (app);
+ }
}
static void
@@ -445,7 +445,7 @@ gs_shell_details_list_header_func (GtkListBoxRow *row,
*/
void
gs_shell_details_setup (GsShellDetails *shell_details,
- GsShell *shell,
+ GsShell *shell,
GsPluginLoader *plugin_loader,
GtkBuilder *builder,
GCancellable *cancellable)
@@ -456,7 +456,7 @@ gs_shell_details_setup (GsShellDetails *shell_details,
g_return_if_fail (GS_IS_SHELL_DETAILS (shell_details));
- priv->shell = shell;
+ priv->shell = shell;
priv->plugin_loader = g_object_ref (plugin_loader);
priv->builder = g_object_ref (builder);
@@ -526,8 +526,8 @@ gs_shell_details_finalize (GObject *object)
g_object_unref (priv->builder);
g_object_unref (priv->plugin_loader);
g_object_unref (priv->cancellable);
- if (priv->app)
- g_object_unref (priv->app);
+ if (priv->app)
+ g_object_unref (priv->app);
G_OBJECT_CLASS (gs_shell_details_parent_class)->finalize (object);
}
diff --git a/src/gs-shell-details.h b/src/gs-shell-details.h
index ebfc0cb..b0c45fa 100644
--- a/src/gs-shell-details.h
+++ b/src/gs-shell-details.h
@@ -57,10 +57,10 @@ GsShellDetails *gs_shell_details_new (void);
void gs_shell_details_invalidate (GsShellDetails *shell_details);
void gs_shell_details_set_app (GsShellDetails *shell_details,
GsApp *app);
-GsApp *gs_shell_details_get_app (GsShellDetails *shell_details);
+GsApp *gs_shell_details_get_app (GsShellDetails *shell_details);
void gs_shell_details_refresh (GsShellDetails *shell_details);
-void gs_shell_details_setup (GsShellDetails *shell_details,
- GsShell *shell,
+void gs_shell_details_setup (GsShellDetails *shell_details,
+ GsShell *shell,
GsPluginLoader *plugin_loader,
GtkBuilder *builder,
GCancellable *cancellable);
diff --git a/src/gs-shell-installed.c b/src/gs-shell-installed.c
index 0fcdd12..091e3ff 100644
--- a/src/gs-shell-installed.c
+++ b/src/gs-shell-installed.c
@@ -31,8 +31,8 @@
#include "gs-app-widget.h"
static void gs_shell_installed_finalize (GObject *object);
-static void remove_row (GtkListBox *list_box,
- GtkWidget *child);
+static void remove_row (GtkListBox *list_box,
+ GtkWidget *child);
#define GS_SHELL_INSTALLED_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GS_TYPE_SHELL_INSTALLED,
GsShellInstalledPrivate))
@@ -46,7 +46,7 @@ struct GsShellInstalledPrivate
GtkSizeGroup *sizegroup_name;
gboolean cache_valid;
gboolean waiting;
- GsShell *shell;
+ GsShell *shell;
};
G_DEFINE_TYPE (GsShellInstalled, gs_shell_installed, G_TYPE_OBJECT)
@@ -62,15 +62,15 @@ gs_shell_installed_invalidate (GsShellInstalled *shell_installed)
static void
gs_shell_installed_app_widget_activated_cb (GtkListBox *list_box,
- GtkListBoxRow *row,
+ GtkListBoxRow *row,
GsShellInstalled *shell_installed)
{
- GsAppWidget *app_widget;
- GsApp *app;
+ GsAppWidget *app_widget;
+ GsApp *app;
- app_widget = GS_APP_WIDGET (gtk_bin_get_child (GTK_BIN (row)));
+ app_widget = GS_APP_WIDGET (gtk_bin_get_child (GTK_BIN (row)));
app = gs_app_widget_get_app (app_widget);
- gs_shell_show_app (shell_installed->priv->shell, app);
+ gs_shell_show_app (shell_installed->priv->shell, app);
}
typedef struct {
@@ -81,29 +81,29 @@ typedef struct {
static void
row_unrevealed (GObject *revealer, GParamSpec *pspec, gpointer data)
{
- GtkWidget *row, *list;
+ GtkWidget *row, *list;
- row = gtk_widget_get_parent (GTK_WIDGET (revealer));
- list = gtk_widget_get_parent (row);
+ row = gtk_widget_get_parent (GTK_WIDGET (revealer));
+ list = gtk_widget_get_parent (row);
- gtk_container_remove (GTK_CONTAINER (list), row);
+ gtk_container_remove (GTK_CONTAINER (list), row);
}
static void
remove_row (GtkListBox *list_box, GtkWidget *child)
{
- GtkWidget *row, *revealer;
-
- gtk_widget_set_sensitive (child, FALSE);
- row = gtk_widget_get_parent (child);
- revealer = gtk_revealer_new ();
- gtk_revealer_set_reveal_child (GTK_REVEALER (revealer), TRUE);
- gtk_widget_show (revealer);
- gtk_widget_reparent (child, revealer);
- gtk_container_add (GTK_CONTAINER (row), revealer);
- g_signal_connect (revealer, "notify::child-revealed",
- G_CALLBACK (row_unrevealed), NULL);
- gtk_revealer_set_reveal_child (GTK_REVEALER (revealer), FALSE);
+ GtkWidget *row, *revealer;
+
+ gtk_widget_set_sensitive (child, FALSE);
+ row = gtk_widget_get_parent (child);
+ revealer = gtk_revealer_new ();
+ gtk_revealer_set_reveal_child (GTK_REVEALER (revealer), TRUE);
+ gtk_widget_show (revealer);
+ gtk_widget_reparent (child, revealer);
+ gtk_container_add (GTK_CONTAINER (row), revealer);
+ g_signal_connect (revealer, "notify::child-revealed",
+ G_CALLBACK (row_unrevealed), NULL);
+ gtk_revealer_set_reveal_child (GTK_REVEALER (revealer), FALSE);
}
/**
@@ -117,8 +117,8 @@ gs_shell_installed_finished_func (GsPluginLoader *plugin_loader, GsApp *app, gpo
/* remove from the list */
if (app != NULL) {
- remove_row (GTK_LIST_BOX (priv->list_box_installed),
- GTK_WIDGET (helper->app_widget));
+ remove_row (GTK_LIST_BOX (priv->list_box_installed),
+ GTK_WIDGET (helper->app_widget));
}
g_object_unref (helper->app_widget);
g_object_unref (helper->shell_installed);
@@ -177,28 +177,28 @@ gs_shell_installed_app_remove_cb (GsAppWidget *app_widget,
static void
app_state_changed (GsApp *app, GtkWidget *widget)
{
- GtkWidget *row, *list;
+ GtkWidget *row, *list;
- if (gs_app_get_state (app) == GS_APP_STATE_AVAILABLE) {
- row = gtk_widget_get_parent (widget);
- list = gtk_widget_get_parent (row);
- remove_row (GTK_LIST_BOX (list), widget);
- }
+ if (gs_app_get_state (app) == GS_APP_STATE_AVAILABLE) {
+ row = gtk_widget_get_parent (widget);
+ list = gtk_widget_get_parent (row);
+ remove_row (GTK_LIST_BOX (list), widget);
+ }
}
static void
gs_shell_installed_add_app (GsShellInstalled *shell, GsApp *app)
{
GsShellInstalledPrivate *priv = shell->priv;
- GtkWidget *widget;
+ GtkWidget *widget;
g_debug ("adding to installed list: %s", gs_app_get_id (app));
widget = gs_app_widget_new ();
- gs_app_widget_set_colorful (GS_APP_WIDGET (widget), FALSE);
+ gs_app_widget_set_colorful (GS_APP_WIDGET (widget), FALSE);
g_signal_connect (widget, "button-clicked",
G_CALLBACK (gs_shell_installed_app_remove_cb), shell);
- g_signal_connect_object (app, "state-changed",
- G_CALLBACK (app_state_changed), widget, 0);
+ g_signal_connect_object (app, "state-changed",
+ G_CALLBACK (app_state_changed), widget, 0);
gs_app_widget_set_app (GS_APP_WIDGET (widget), app);
gtk_container_add (GTK_CONTAINER (priv->list_box_installed), widget);
gs_app_widget_set_size_groups (GS_APP_WIDGET (widget),
@@ -224,13 +224,13 @@ gs_shell_installed_get_installed_cb (GObject *source_object,
GsPluginLoader *plugin_loader = GS_PLUGIN_LOADER (source_object);
GtkWidget *widget;
- widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "spinner_install"));
- gs_stop_spinner (GTK_SPINNER (widget));
- widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "stack_install"));
- gtk_stack_set_visible_child_name (GTK_STACK (widget), "view");
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "spinner_install"));
+ gs_stop_spinner (GTK_SPINNER (widget));
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "stack_install"));
+ gtk_stack_set_visible_child_name (GTK_STACK (widget), "view");
- priv->waiting = FALSE;
- priv->cache_valid = TRUE;
+ priv->waiting = FALSE;
+ priv->cache_valid = TRUE;
list = gs_plugin_loader_get_installed_finish (plugin_loader,
res,
@@ -242,7 +242,7 @@ gs_shell_installed_get_installed_cb (GObject *source_object,
}
for (l = list; l != NULL; l = l->next) {
app = GS_APP (l->data);
- gs_shell_installed_add_app (shell_installed, app);
+ gs_shell_installed_add_app (shell_installed, app);
}
out: ;
}
@@ -250,19 +250,19 @@ out: ;
static void
reset_date (GtkWidget *row, gpointer data)
{
- GtkWidget *child;
- GsApp *app;
-
- child = gtk_bin_get_child (GTK_BIN (row));
- app = gs_app_widget_get_app (GS_APP_WIDGET (child));
-
- if (gs_app_get_state (app) == GS_APP_STATE_REMOVING) {
- /* sort removing apps above installed apps,
- * below installing apps
- */
- gs_app_set_install_date (app, G_MAXUINT - 2);
- gtk_list_box_row_changed (GTK_LIST_BOX_ROW (row));
- }
+ GtkWidget *child;
+ GsApp *app;
+
+ child = gtk_bin_get_child (GTK_BIN (row));
+ app = gs_app_widget_get_app (GS_APP_WIDGET (child));
+
+ if (gs_app_get_state (app) == GS_APP_STATE_REMOVING) {
+ /* sort removing apps above installed apps,
+ * below installing apps
+ */
+ gs_app_set_install_date (app, G_MAXUINT - 2);
+ gtk_list_box_row_changed (GTK_LIST_BOX_ROW (row));
+ }
}
static void
@@ -270,8 +270,8 @@ resort_list (GsShellInstalled *shell)
{
GsShellInstalledPrivate *priv = shell->priv;
- gtk_container_foreach (GTK_CONTAINER (priv->list_box_installed),
- reset_date, NULL);
+ gtk_container_foreach (GTK_CONTAINER (priv->list_box_installed),
+ reset_date, NULL);
}
/**
@@ -281,35 +281,35 @@ void
gs_shell_installed_refresh (GsShellInstalled *shell_installed, gboolean scroll_up)
{
GsShellInstalledPrivate *priv = shell_installed->priv;
- GtkWidget *widget;
- GtkSpinner *spinner;
-
- if (gs_shell_get_mode (priv->shell) == GS_SHELL_MODE_INSTALLED) {
- widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "buttonbox_main"));
- gtk_widget_show (widget);
- }
-
- resort_list (shell_installed);
-
- widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "scrolledwindow_install"));
- if (scroll_up) {
- GtkAdjustment *adj;
- adj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (widget));
- gtk_adjustment_set_value (adj, gtk_adjustment_get_lower (adj));
- }
- if (gs_shell_get_mode (priv->shell) == GS_SHELL_MODE_INSTALLED) {
- gs_grab_focus_when_mapped (widget);
- }
+ GtkWidget *widget;
+ GtkSpinner *spinner;
+
+ if (gs_shell_get_mode (priv->shell) == GS_SHELL_MODE_INSTALLED) {
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "buttonbox_main"));
+ gtk_widget_show (widget);
+ }
+
+ resort_list (shell_installed);
+
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "scrolledwindow_install"));
+ if (scroll_up) {
+ GtkAdjustment *adj;
+ adj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (widget));
+ gtk_adjustment_set_value (adj, gtk_adjustment_get_lower (adj));
+ }
+ if (gs_shell_get_mode (priv->shell) == GS_SHELL_MODE_INSTALLED) {
+ gs_grab_focus_when_mapped (widget);
+ }
/* no need to refresh */
if (priv->cache_valid)
return;
- widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "spinner_install"));
- gtk_widget_show (widget);
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "spinner_install"));
+ gtk_widget_show (widget);
- if (priv->waiting)
- return;
+ if (priv->waiting)
+ return;
/* remove old entries */
gs_container_remove_all (GTK_CONTAINER (priv->list_box_installed));
@@ -320,10 +320,10 @@ gs_shell_installed_refresh (GsShellInstalled *shell_installed, gboolean scroll_u
gs_shell_installed_get_installed_cb,
shell_installed);
- spinner = GTK_SPINNER (gtk_builder_get_object (shell_installed->priv->builder, "spinner_install"));
- gs_start_spinner (spinner);
- widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "stack_install"));
- gtk_stack_set_visible_child_name (GTK_STACK (widget), "spinner");
+ spinner = GTK_SPINNER (gtk_builder_get_object (shell_installed->priv->builder, "spinner_install"));
+ gs_start_spinner (spinner);
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "stack_install"));
+ gtk_stack_set_visible_child_name (GTK_STACK (widget), "spinner");
priv->waiting = TRUE;
}
@@ -340,13 +340,13 @@ gs_shell_installed_sort_func (GtkListBoxRow *a,
GsAppWidget *aw2 = GS_APP_WIDGET (gtk_bin_get_child (GTK_BIN (b)));
GsApp *a1 = gs_app_widget_get_app (aw1);
GsApp *a2 = gs_app_widget_get_app (aw2);
- guint64 date1 = gs_app_get_install_date (a1);
- guint64 date2 = gs_app_get_install_date (a2);
+ guint64 date1 = gs_app_get_install_date (a1);
+ guint64 date2 = gs_app_get_install_date (a2);
- if (date1 < date2)
- return 1;
- else if (date2 < date1)
- return -1;
+ if (date1 < date2)
+ return 1;
+ else if (date2 < date1)
+ return -1;
return g_strcmp0 (gs_app_get_name (a1),
gs_app_get_name (a2));
@@ -388,8 +388,8 @@ gs_shell_installed_pending_apps_changed_cb (GsPluginLoader *plugin_loader,
gchar *label;
GPtrArray *pending;
GtkWidget *widget;
- guint i;
- GsApp *app;
+ guint i;
+ GsApp *app;
widget = GTK_WIDGET (gtk_builder_get_object (shell_installed->priv->builder,
"label_button_installed"));
@@ -398,16 +398,16 @@ gs_shell_installed_pending_apps_changed_cb (GsPluginLoader *plugin_loader,
label = g_strdup (_("Installed"));
else
label = g_strdup_printf (_("Installed (%d)"), pending->len);
- for (i = 0; i < pending->len; i++) {
- app = GS_APP (g_ptr_array_index (pending, i));
- if (gs_app_get_state (app) == GS_APP_STATE_INSTALLING) {
- /* sort installing apps above removing and
- * installed apps
- */
- gs_app_set_install_date (app, G_MAXUINT - 1);
- gs_shell_installed_add_app (shell_installed, app);
- }
- }
+ for (i = 0; i < pending->len; i++) {
+ app = GS_APP (g_ptr_array_index (pending, i));
+ if (gs_app_get_state (app) == GS_APP_STATE_INSTALLING) {
+ /* sort installing apps above removing and
+ * installed apps
+ */
+ gs_app_set_install_date (app, G_MAXUINT - 1);
+ gs_shell_installed_add_app (shell_installed, app);
+ }
+ }
gtk_label_set_label (GTK_LABEL (widget), label);
g_free (label);
@@ -419,7 +419,7 @@ gs_shell_installed_pending_apps_changed_cb (GsPluginLoader *plugin_loader,
*/
void
gs_shell_installed_setup (GsShellInstalled *shell_installed,
- GsShell *shell,
+ GsShell *shell,
GsPluginLoader *plugin_loader,
GtkBuilder *builder,
GCancellable *cancellable)
@@ -428,7 +428,7 @@ gs_shell_installed_setup (GsShellInstalled *shell_installed,
g_return_if_fail (GS_IS_SHELL_INSTALLED (shell_installed));
- priv->shell = shell;
+ priv->shell = shell;
priv->plugin_loader = g_object_ref (plugin_loader);
g_signal_connect (priv->plugin_loader, "pending-apps-changed",
G_CALLBACK (gs_shell_installed_pending_apps_changed_cb),
diff --git a/src/gs-shell-installed.h b/src/gs-shell-installed.h
index b30af50..998176f 100644
--- a/src/gs-shell-installed.h
+++ b/src/gs-shell-installed.h
@@ -54,9 +54,9 @@ GType gs_shell_installed_get_type (void);
GsShellInstalled *gs_shell_installed_new (void);
void gs_shell_installed_invalidate (GsShellInstalled *shell_installed);
void gs_shell_installed_refresh (GsShellInstalled *shell_installed,
- gboolean scroll_up);
-void gs_shell_installed_setup (GsShellInstalled *shell_installed,
- GsShell *shell,
+ gboolean scroll_up);
+void gs_shell_installed_setup (GsShellInstalled *shell_installed,
+ GsShell *shell,
GsPluginLoader *plugin_loader,
GtkBuilder *builder,
GCancellable *cancellable);
diff --git a/src/gs-shell-overview.c b/src/gs-shell-overview.c
index f2c7def..2a32825 100644
--- a/src/gs-shell-overview.c
+++ b/src/gs-shell-overview.c
@@ -38,15 +38,15 @@ struct GsShellOverviewPrivate
GtkBuilder *builder;
GCancellable *cancellable;
gboolean cache_valid;
- GsShell *shell;
- gint refresh_count;
+ GsShell *shell;
+ gint refresh_count;
};
G_DEFINE_TYPE_WITH_PRIVATE (GsShellOverview, gs_shell_overview, G_TYPE_OBJECT)
enum {
- SIGNAL_REFRESHED,
- SIGNAL_LAST
+ SIGNAL_REFRESHED,
+ SIGNAL_LAST
};
static guint signals [SIGNAL_LAST] = { 0 };
@@ -67,7 +67,7 @@ popular_tile_clicked (GsPopularTile *tile, gpointer data)
GsApp *app;
app = gs_popular_tile_get_app (tile);
- gs_shell_show_app (shell->priv->shell, app);
+ gs_shell_show_app (shell->priv->shell, app);
}
/**
@@ -101,39 +101,39 @@ gs_shell_overview_get_popular_cb (GObject *source_object,
for (l = list, i = 0; l != NULL && i < 6; l = l->next, i++) {
app = GS_APP (l->data);
tile = gs_popular_tile_new (app);
- g_signal_connect (tile, "clicked",
+ g_signal_connect (tile, "clicked",
G_CALLBACK (popular_tile_clicked), shell);
- gtk_box_pack_start (GTK_BOX (grid), tile, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (grid), tile, TRUE, TRUE, 0);
}
out:
- priv->refresh_count--;
- if (priv->refresh_count == 0)
- g_signal_emit (shell, signals[SIGNAL_REFRESHED], 0);
+ priv->refresh_count--;
+ if (priv->refresh_count == 0)
+ g_signal_emit (shell, signals[SIGNAL_REFRESHED], 0);
}
static void
feature_tile_clicked (GsFeatureTile *tile, gpointer data)
{
GsShellOverview *shell = GS_SHELL_OVERVIEW (data);
- GsApp *app;
+ GsApp *app;
- app = gs_feature_tile_get_app (tile);
- gs_shell_show_app (shell->priv->shell, app);
+ app = gs_feature_tile_get_app (tile);
+ gs_shell_show_app (shell->priv->shell, app);
}
static void
gs_shell_overview_get_featured_cb (GObject *source_object,
- GAsyncResult *res,
- gpointer user_data)
+ GAsyncResult *res,
+ gpointer user_data)
{
GsShellOverview *shell = GS_SHELL_OVERVIEW (user_data);
GsShellOverviewPrivate *priv = shell->priv;
GsPluginLoader *plugin_loader = GS_PLUGIN_LOADER (source_object);
GtkWidget *tile;
GtkWidget *box;
- GList *list;
- GError *error = NULL;
- GsApp *app;
+ GList *list;
+ GError *error = NULL;
+ GsApp *app;
list = gs_plugin_loader_get_featured_finish (plugin_loader, res, &error);
if (list == NULL) {
@@ -144,30 +144,30 @@ gs_shell_overview_get_featured_cb (GObject *source_object,
/* at the moment, we only care about the first app */
app = GS_APP (list->data);
- box = GTK_WIDGET (gtk_builder_get_object (priv->builder, "feature"));
- tile = gs_feature_tile_new (app);
+ box = GTK_WIDGET (gtk_builder_get_object (priv->builder, "feature"));
+ tile = gs_feature_tile_new (app);
g_signal_connect (tile, "clicked",
G_CALLBACK (feature_tile_clicked), shell);
- gs_container_remove_all (GTK_CONTAINER (box));
- gtk_container_add (GTK_CONTAINER (box), tile);
+ gs_container_remove_all (GTK_CONTAINER (box));
+ gtk_container_add (GTK_CONTAINER (box), tile);
out:
g_list_free (list);
- priv->refresh_count--;
- if (priv->refresh_count == 0)
- g_signal_emit (shell, signals[SIGNAL_REFRESHED], 0);
+ priv->refresh_count--;
+ if (priv->refresh_count == 0)
+ g_signal_emit (shell, signals[SIGNAL_REFRESHED], 0);
}
static void
category_tile_clicked (GsCategoryTile *tile, gpointer data)
{
GsShellOverview *shell = GS_SHELL_OVERVIEW (data);
- GsCategory *category;
+ GsCategory *category;
category = gs_category_tile_get_category (tile);
- gs_shell_show_category (shell->priv->shell, category);
+ gs_shell_show_category (shell->priv->shell, category);
}
/**
@@ -198,17 +198,17 @@ gs_shell_overview_get_categories_cb (GObject *source_object,
grid = GTK_WIDGET (gtk_builder_get_object (priv->builder, "grid_categories"));
for (l = list, i = 0; l; l = l->next, i++) {
cat = GS_CATEGORY (l->data);
- tile = gs_category_tile_new (cat);
- g_signal_connect (tile, "clicked",
- G_CALLBACK (category_tile_clicked), shell);
+ tile = gs_category_tile_new (cat);
+ g_signal_connect (tile, "clicked",
+ G_CALLBACK (category_tile_clicked), shell);
gtk_grid_attach (GTK_GRID (grid), tile, i % 3, i / 3, 1, 1);
}
- g_list_free_full (list, g_object_unref);
+ g_list_free_full (list, g_object_unref);
out:
priv->cache_valid = TRUE;
- priv->refresh_count--;
- if (priv->refresh_count == 0)
- g_signal_emit (shell, signals[SIGNAL_REFRESHED], 0);
+ priv->refresh_count--;
+ if (priv->refresh_count == 0)
+ g_signal_emit (shell, signals[SIGNAL_REFRESHED], 0);
}
/**
@@ -220,26 +220,26 @@ gs_shell_overview_refresh (GsShellOverview *shell, gboolean scroll_up)
GsShellOverviewPrivate *priv = shell->priv;
GtkWidget *widget;
GtkWidget *grid;
- GtkAdjustment *adj;
-
- if (gs_shell_get_mode (priv->shell) == GS_SHELL_MODE_OVERVIEW) {
- widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "buttonbox_main"));
- gtk_widget_show (widget);
- widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "search_bar"));
- gtk_widget_show (widget);
- widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "entry_search"));
- gtk_entry_set_text (GTK_ENTRY (widget), "");
- }
+ GtkAdjustment *adj;
+
+ if (gs_shell_get_mode (priv->shell) == GS_SHELL_MODE_OVERVIEW) {
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "buttonbox_main"));
+ gtk_widget_show (widget);
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "search_bar"));
+ gtk_widget_show (widget);
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "entry_search"));
+ gtk_entry_set_text (GTK_ENTRY (widget), "");
+ }
widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "scrolledwindow_overview"));
- if (scroll_up) {
- adj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (widget));
- gtk_adjustment_set_value (adj, gtk_adjustment_get_lower (adj));
- }
+ if (scroll_up) {
+ adj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (widget));
+ gtk_adjustment_set_value (adj, gtk_adjustment_get_lower (adj));
+ }
- if (gs_shell_get_mode (priv->shell) == GS_SHELL_MODE_OVERVIEW) {
- gs_grab_focus_when_mapped (widget);
- }
+ if (gs_shell_get_mode (priv->shell) == GS_SHELL_MODE_OVERVIEW) {
+ gs_grab_focus_when_mapped (widget);
+ }
if (priv->cache_valid)
return;
@@ -247,7 +247,7 @@ gs_shell_overview_refresh (GsShellOverview *shell, gboolean scroll_up)
grid = GTK_WIDGET (gtk_builder_get_object (priv->builder, "box_popular"));
gs_container_remove_all (GTK_CONTAINER (grid));
- priv->refresh_count = 3;
+ priv->refresh_count = 3;
gs_plugin_loader_get_featured_async (priv->plugin_loader,
priv->cancellable,
@@ -270,7 +270,7 @@ gs_shell_overview_refresh (GsShellOverview *shell, gboolean scroll_up)
void
gs_shell_overview_setup (GsShellOverview *shell_overview,
- GsShell *shell,
+ GsShell *shell,
GsPluginLoader *plugin_loader,
GtkBuilder *builder,
GCancellable *cancellable)
@@ -283,8 +283,8 @@ gs_shell_overview_setup (GsShellOverview *shell_overview,
priv->builder = g_object_ref (builder);
priv->cancellable = g_object_ref (cancellable);
- /* avoid a ref cycle */
- priv->shell = shell;
+ /* avoid a ref cycle */
+ priv->shell = shell;
}
static void
@@ -315,12 +315,12 @@ gs_shell_overview_class_init (GsShellOverviewClass *klass)
GObjectClass *object_class = G_OBJECT_CLASS (klass);
object_class->finalize = gs_shell_overview_finalize;
- signals [SIGNAL_REFRESHED] =
- g_signal_new ("refreshed",
- G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (GsShellOverviewClass, refreshed),
- NULL, NULL, g_cclosure_marshal_VOID__VOID,
- G_TYPE_NONE, 0);
+ signals [SIGNAL_REFRESHED] =
+ g_signal_new ("refreshed",
+ G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (GsShellOverviewClass, refreshed),
+ NULL, NULL, g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
}
/**
diff --git a/src/gs-shell-overview.h b/src/gs-shell-overview.h
index 7f413fd..04e9fe2 100644
--- a/src/gs-shell-overview.h
+++ b/src/gs-shell-overview.h
@@ -34,7 +34,7 @@ G_BEGIN_DECLS
#define GS_TYPE_SHELL_OVERVIEW (gs_shell_overview_get_type ())
#define GS_SHELL_OVERVIEW(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GS_TYPE_SHELL_OVERVIEW,
GsShellOverview))
#define GS_SHELL_OVERVIEW_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GS_TYPE_SHELL_OVERVIEW,
GsShellOverviewClass))
-#define GS_IS_SHELL_OVERVIEW(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GS_TYPE_SHELL_OVERVIEW))
+#define GS_IS_SHELL_OVERVIEW(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GS_TYPE_SHELL_OVERVIEW))
#define GS_IS_SHELL_OVERVIEW_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GS_TYPE_SHELL_OVERVIEW))
#define GS_SHELL_OVERVIEW_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GS_TYPE_SHELL_OVERVIEW,
GsShellOverviewClass))
@@ -50,7 +50,7 @@ typedef struct
{
GObjectClass parent_class;
- void (*refreshed) (GsShellOverview *shell);
+ void (*refreshed) (GsShellOverview *shell);
} GsShellOverviewClass;
GType gs_shell_overview_get_type (void);
@@ -58,9 +58,9 @@ GType gs_shell_overview_get_type (void);
GsShellOverview *gs_shell_overview_new (void);
void gs_shell_overview_invalidate (GsShellOverview *shell_overview);
void gs_shell_overview_refresh (GsShellOverview *shell_overview,
- gboolean scroll_up);
-void gs_shell_overview_setup (GsShellOverview *shell_overview,
- GsShell *shell,
+ gboolean scroll_up);
+void gs_shell_overview_setup (GsShellOverview *shell_overview,
+ GsShell *shell,
GsPluginLoader *plugin_loader,
GtkBuilder *builder,
GCancellable *cancellable);
diff --git a/src/gs-shell-search.c b/src/gs-shell-search.c
index ffc40b6..b7887a1 100644
--- a/src/gs-shell-search.c
+++ b/src/gs-shell-search.c
@@ -43,30 +43,30 @@ struct GsShellSearchPrivate
GtkSizeGroup *sizegroup_image;
GtkSizeGroup *sizegroup_name;
gboolean waiting;
- GsShell *shell;
+ GsShell *shell;
};
G_DEFINE_TYPE (GsShellSearch, gs_shell_search, G_TYPE_OBJECT)
static void
gs_shell_search_app_widget_activated_cb (GtkListBox *list_box,
- GtkListBoxRow *row,
+ GtkListBoxRow *row,
GsShellSearch *shell_search)
{
GsApp *app;
- GsAppWidget *app_widget;
+ GsAppWidget *app_widget;
- app_widget = GS_APP_WIDGET (gtk_bin_get_child (GTK_BIN (row)));
+ app_widget = GS_APP_WIDGET (gtk_bin_get_child (GTK_BIN (row)));
app = gs_app_widget_get_app (app_widget);
- gs_shell_show_app (shell_search->priv->shell, app);
+ gs_shell_show_app (shell_search->priv->shell, app);
}
static void
gs_shell_search_installed_func (GsPluginLoader *plugin_loader, GsApp *app, gpointer user_data)
{
- if (app) {
- gs_app_notify_installed (app);
- }
+ if (app) {
+ gs_app_notify_installed (app);
+ }
}
/**
@@ -165,20 +165,20 @@ gs_shell_search_get_search_cb (GObject *source_object,
GsPluginLoader *plugin_loader = GS_PLUGIN_LOADER (source_object);
GtkWidget *widget;
- widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "spinner_search"));
- gs_stop_spinner (GTK_SPINNER (widget));
- widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "stack_search"));
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "spinner_search"));
+ gs_stop_spinner (GTK_SPINNER (widget));
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "stack_search"));
- priv->waiting = FALSE;
+ priv->waiting = FALSE;
list = gs_plugin_loader_search_finish (plugin_loader, res, &error);
if (list == NULL) {
g_warning ("failed to get search apps: %s", error->message);
g_error_free (error);
- gtk_stack_set_visible_child_name (GTK_STACK (widget), "no-results");
+ gtk_stack_set_visible_child_name (GTK_STACK (widget), "no-results");
goto out;
}
- gtk_stack_set_visible_child_name (GTK_STACK (widget), "results");
+ gtk_stack_set_visible_child_name (GTK_STACK (widget), "results");
for (l = list; l != NULL; l = l->next) {
app = GS_APP (l->data);
g_debug ("adding search %s", gs_app_get_id (app));
@@ -204,17 +204,17 @@ void
gs_shell_search_refresh (GsShellSearch *shell_search, const gchar *value)
{
GsShellSearchPrivate *priv = shell_search->priv;
- GtkWidget *widget;
- GtkSpinner *spinner;
+ GtkWidget *widget;
+ GtkSpinner *spinner;
- widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "buttonbox_main"));
- gtk_widget_show (widget);
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "buttonbox_main"));
+ gtk_widget_show (widget);
widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "search_bar"));
gtk_widget_show (widget);
- if (priv->waiting)
- return;
+ if (priv->waiting)
+ return;
/* remove old entries */
gs_container_remove_all (GTK_CONTAINER (priv->list_box_search));
@@ -226,10 +226,10 @@ gs_shell_search_refresh (GsShellSearch *shell_search, const gchar *value)
gs_shell_search_get_search_cb,
shell_search);
- widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "stack_search"));
- gtk_stack_set_visible_child_name (GTK_STACK (widget), "spinner");
- spinner = GTK_SPINNER (gtk_builder_get_object (priv->builder, "spinner_search"));
- gs_start_spinner (spinner);
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "stack_search"));
+ gtk_stack_set_visible_child_name (GTK_STACK (widget), "spinner");
+ spinner = GTK_SPINNER (gtk_builder_get_object (priv->builder, "spinner_search"));
+ gs_start_spinner (spinner);
priv->waiting = TRUE;
}
@@ -255,13 +255,13 @@ gs_shell_search_sort_func (GtkListBoxRow *a,
GsAppWidget *aw2 = GS_APP_WIDGET (gtk_bin_get_child (GTK_BIN (b)));
GsApp *a1 = gs_app_widget_get_app (aw1);
GsApp *a2 = gs_app_widget_get_app (aw2);
- guint64 date1 = gs_app_get_install_date (a1);
- guint64 date2 = gs_app_get_install_date (a2);
+ guint64 date1 = gs_app_get_install_date (a1);
+ guint64 date2 = gs_app_get_install_date (a2);
- if (date1 < date2)
- return 1;
- else if (date2 < date1)
- return -1;
+ if (date1 < date2)
+ return 1;
+ else if (date2 < date1)
+ return -1;
return g_strcmp0 (gs_app_get_name (a1),
gs_app_get_name (a2));
@@ -356,7 +356,7 @@ gs_shell_search_list_header_func (GtkListBoxRow *row,
*/
void
gs_shell_search_setup (GsShellSearch *shell_search,
- GsShell *shell,
+ GsShell *shell,
GsPluginLoader *plugin_loader,
GtkBuilder *builder,
GCancellable *cancellable)
@@ -369,7 +369,7 @@ gs_shell_search_setup (GsShellSearch *shell_search,
priv->plugin_loader = g_object_ref (plugin_loader);
priv->builder = g_object_ref (builder);
priv->cancellable = g_object_ref (cancellable);
- priv->shell = shell;
+ priv->shell = shell;
/* refilter on search box changing */
widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "entry_search"));
diff --git a/src/gs-shell-search.h b/src/gs-shell-search.h
index 68a0871..cc8a107 100644
--- a/src/gs-shell-search.h
+++ b/src/gs-shell-search.h
@@ -55,8 +55,8 @@ GType gs_shell_search_get_type (void);
GsShellSearch *gs_shell_search_new (void);
void gs_shell_search_refresh (GsShellSearch *shell_search,
const gchar *text);
-void gs_shell_search_setup (GsShellSearch *shell_search,
- GsShell *shell,
+void gs_shell_search_setup (GsShellSearch *shell_search,
+ GsShell *shell,
GsPluginLoader *plugin_loader,
GtkBuilder *builder,
GCancellable *cancellable);
diff --git a/src/gs-shell-updates.c b/src/gs-shell-updates.c
index c6154da..5e79c60 100644
--- a/src/gs-shell-updates.c
+++ b/src/gs-shell-updates.c
@@ -41,8 +41,8 @@ struct GsShellUpdatesPrivate
GtkListBox *list_box_updates;
gboolean cache_valid;
gboolean waiting;
- GsShell *shell;
- GsApp *app;
+ GsShell *shell;
+ GsApp *app;
};
enum {
@@ -78,33 +78,33 @@ gs_shell_updates_get_updates_cb (GsPluginLoader *plugin_loader,
GsShellUpdatesPrivate *priv = shell_updates->priv;
GtkWidget *widget;
- priv->waiting = FALSE;
- priv->cache_valid = TRUE;
+ priv->waiting = FALSE;
+ priv->cache_valid = TRUE;
- widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "spinner_updates"));
- gs_stop_spinner (GTK_SPINNER (widget));
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "spinner_updates"));
+ gs_stop_spinner (GTK_SPINNER (widget));
/* get the results */
list = gs_plugin_loader_get_updates_finish (plugin_loader, res, &error);
- widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "stack_updates"));
- if (list == NULL) {
- gtk_stack_set_visible_child_name (GTK_STACK (widget), "uptodate");
- }
- else {
- gtk_stack_set_visible_child_name (GTK_STACK (widget), "view");
- }
-
- widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "button_updates"));
- if (list != NULL && gs_shell_get_mode (priv->shell) != GS_SHELL_MODE_UPDATES)
- gtk_style_context_add_class (gtk_widget_get_style_context (widget), "needs-attention");
- else
- gtk_style_context_remove_class (gtk_widget_get_style_context (widget), "needs-attention");
-
- if (gs_shell_get_mode (priv->shell) == GS_SHELL_MODE_UPDATES) {
- widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "button_update_all"));
- gtk_widget_set_visible (widget, list != NULL);
- }
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "stack_updates"));
+ if (list == NULL) {
+ gtk_stack_set_visible_child_name (GTK_STACK (widget), "uptodate");
+ }
+ else {
+ gtk_stack_set_visible_child_name (GTK_STACK (widget), "view");
+ }
+
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "button_updates"));
+ if (list != NULL && gs_shell_get_mode (priv->shell) != GS_SHELL_MODE_UPDATES)
+ gtk_style_context_add_class (gtk_widget_get_style_context (widget), "needs-attention");
+ else
+ gtk_style_context_remove_class (gtk_widget_get_style_context (widget), "needs-attention");
+
+ if (gs_shell_get_mode (priv->shell) == GS_SHELL_MODE_UPDATES) {
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "button_update_all"));
+ gtk_widget_set_visible (widget, list != NULL);
+ }
if (list == NULL) {
g_warning ("failed to get updates: %s", error->message);
g_error_free (error);
@@ -131,35 +131,35 @@ void
gs_shell_updates_refresh (GsShellUpdates *shell_updates, gboolean scroll_up)
{
GsShellUpdatesPrivate *priv = shell_updates->priv;
- GtkWidget *widget;
- GtkSpinner *spinner;
- GList *list;
-
- if (gs_shell_get_mode (priv->shell) == GS_SHELL_MODE_UPDATES) {
- widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "buttonbox_main"));
- gtk_widget_show (widget);
- }
-
- widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "scrolledwindow_updates"));
- if (scroll_up) {
- GtkAdjustment *adj;
- adj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (widget));
- gtk_adjustment_set_value (adj, gtk_adjustment_get_lower (adj));
- }
+ GtkWidget *widget;
+ GtkSpinner *spinner;
+ GList *list;
+
+ if (gs_shell_get_mode (priv->shell) == GS_SHELL_MODE_UPDATES) {
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "buttonbox_main"));
+ gtk_widget_show (widget);
+ }
+
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "scrolledwindow_updates"));
+ if (scroll_up) {
+ GtkAdjustment *adj;
+ adj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (widget));
+ gtk_adjustment_set_value (adj, gtk_adjustment_get_lower (adj));
+ }
/* no need to refresh */
if (priv->cache_valid) {
- widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "button_updates"));
- gtk_style_context_remove_class (gtk_widget_get_style_context (widget), "needs-attention");
- widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "button_update_all"));
- list = gtk_container_get_children (GTK_CONTAINER (priv->list_box_updates));
- gtk_widget_set_visible (widget, list != NULL);
- g_list_free (list);
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "button_updates"));
+ gtk_style_context_remove_class (gtk_widget_get_style_context (widget), "needs-attention");
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "button_update_all"));
+ list = gtk_container_get_children (GTK_CONTAINER (priv->list_box_updates));
+ gtk_widget_set_visible (widget, list != NULL);
+ g_list_free (list);
return;
- }
+ }
- if (priv->waiting)
- return;
+ if (priv->waiting)
+ return;
gs_container_remove_all (GTK_CONTAINER (priv->list_box_updates));
@@ -168,10 +168,10 @@ gs_shell_updates_refresh (GsShellUpdates *shell_updates, gboolean scroll_up)
(GAsyncReadyCallback) gs_shell_updates_get_updates_cb,
shell_updates);
- spinner = GTK_SPINNER (gtk_builder_get_object (priv->builder, "spinner_updates"));
- gs_start_spinner (spinner);
+ spinner = GTK_SPINNER (gtk_builder_get_object (priv->builder, "spinner_updates"));
+ gs_start_spinner (spinner);
widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "stack_updates"));
- gtk_stack_set_visible_child_name (GTK_STACK (widget), "spinner");
+ gtk_stack_set_visible_child_name (GTK_STACK (widget), "spinner");
priv->waiting = TRUE;
}
@@ -219,14 +219,14 @@ gs_shell_updates_set_updates_description_ui (GsShellUpdates *shell_updates, GsAp
static void
gs_shell_updates_row_activated_cb (GtkListBox *list_box,
- GtkListBoxRow *row,
+ GtkListBoxRow *row,
GsShellUpdates *shell_updates)
{
GsShellUpdatesPrivate *priv = shell_updates->priv;
GsApp *app = NULL;
GtkWidget *widget;
- app = GS_APP (g_object_get_data (G_OBJECT (gtk_bin_get_child (GTK_BIN (row))), "app"));
+ app = GS_APP (g_object_get_data (G_OBJECT (gtk_bin_get_child (GTK_BIN (row))), "app"));
/* setup package view */
widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "scrolledwindow_update"));
gtk_widget_hide (widget);
@@ -255,41 +255,41 @@ show_update_details (GsApp *app, GsShellUpdates *shell_updates)
/* set update description */
if (kind == GS_APP_KIND_OS_UPDATE) {
GPtrArray *related;
- GtkListBox *list_box;
+ GtkListBox *list_box;
guint i;
- GtkWidget *row, *label;
+ GtkWidget *row, *label;
- list_box = GTK_LIST_BOX (gtk_builder_get_object (priv->builder, "list_box_update"));
- gs_container_remove_all (GTK_CONTAINER (list_box));
+ list_box = GTK_LIST_BOX (gtk_builder_get_object (priv->builder, "list_box_update"));
+ gs_container_remove_all (GTK_CONTAINER (list_box));
related = gs_app_get_related (app);
for (i = 0; i < related->len; i++) {
app_related = g_ptr_array_index (related, i);
- row = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
- g_object_set_data_full (G_OBJECT (row), "app", g_object_ref (app_related),
g_object_unref);
- label = gtk_label_new (gs_app_get_source (app_related));
- g_object_set (label,
- "margin-left", 20,
- "margin-right", 20,
- "margin-top", 6,
- "margin-bottom", 6,
- "xalign", 0.0,
- NULL);
- gtk_widget_set_halign (label, GTK_ALIGN_START);
- gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
- gtk_box_pack_start (GTK_BOX (row), label, TRUE, TRUE, 0);
- label = gtk_label_new (gs_app_get_update_version (app_related));
- g_object_set (label,
- "margin-left", 20,
- "margin-right", 20,
- "margin-top", 6,
- "margin-bottom", 6,
- "xalign", 1.0,
- NULL);
- gtk_widget_set_halign (label, GTK_ALIGN_END);
- gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
- gtk_box_pack_start (GTK_BOX (row), label, FALSE, FALSE, 0);
- gtk_widget_show_all (row);
- gtk_list_box_insert (list_box,row, -1);
+ row = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
+ g_object_set_data_full (G_OBJECT (row), "app", g_object_ref (app_related),
g_object_unref);
+ label = gtk_label_new (gs_app_get_source (app_related));
+ g_object_set (label,
+ "margin-left", 20,
+ "margin-right", 20,
+ "margin-top", 6,
+ "margin-bottom", 6,
+ "xalign", 0.0,
+ NULL);
+ gtk_widget_set_halign (label, GTK_ALIGN_START);
+ gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
+ gtk_box_pack_start (GTK_BOX (row), label, TRUE, TRUE, 0);
+ label = gtk_label_new (gs_app_get_update_version (app_related));
+ g_object_set (label,
+ "margin-left", 20,
+ "margin-right", 20,
+ "margin-top", 6,
+ "margin-bottom", 6,
+ "xalign", 1.0,
+ NULL);
+ gtk_widget_set_halign (label, GTK_ALIGN_END);
+ gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
+ gtk_box_pack_start (GTK_BOX (row), label, FALSE, FALSE, 0);
+ gtk_widget_show_all (row);
+ gtk_list_box_insert (list_box,row, -1);
}
}
@@ -309,11 +309,11 @@ gs_shell_updates_activated_cb (GtkListBox *list_box,
GsAppWidget *app_widget;
GsApp *app;
- app_widget = GS_APP_WIDGET (gtk_bin_get_child (GTK_BIN (row)));
- app = gs_app_widget_get_app (app_widget);
+ app_widget = GS_APP_WIDGET (gtk_bin_get_child (GTK_BIN (row)));
+ app = gs_app_widget_get_app (app_widget);
- g_clear_object (&priv->app);
- priv->app = g_object_ref (app);
+ g_clear_object (&priv->app);
+ priv->app = g_object_ref (app);
show_update_details (priv->app, shell_updates);
}
@@ -389,93 +389,93 @@ gs_shell_updates_pending_apps_changed_cb (GsPluginLoader *plugin_loader,
static void
reboot_failed (GObject *source,
- GAsyncResult *res,
- gpointer data)
+ GAsyncResult *res,
+ gpointer data)
{
- GVariant *ret;
- const gchar *command;
- GError *error = NULL;
-
- ret = g_dbus_connection_call_finish (G_DBUS_CONNECTION (source), res, &error);
- if (ret)
- g_variant_unref (ret);
-
- if (error) {
- g_warning ("Calling org.gnome.SessionManager.Reboot failed: %s\n", error->message);
- g_error_free (error);
- return;
- }
-
- command = "pkexec /usr/libexec/pk-trigger-offline-update --cancel";
- g_debug ("calling '%s'", command);
- if (!g_spawn_command_line_sync (command, NULL, NULL, NULL, &error)) {
- g_warning ("Failed to call '%s': %s\n", command, error->message);
- g_error_free (error);
- }
+ GVariant *ret;
+ const gchar *command;
+ GError *error = NULL;
+
+ ret = g_dbus_connection_call_finish (G_DBUS_CONNECTION (source), res, &error);
+ if (ret)
+ g_variant_unref (ret);
+
+ if (error) {
+ g_warning ("Calling org.gnome.SessionManager.Reboot failed: %s\n", error->message);
+ g_error_free (error);
+ return;
+ }
+
+ command = "pkexec /usr/libexec/pk-trigger-offline-update --cancel";
+ g_debug ("calling '%s'", command);
+ if (!g_spawn_command_line_sync (command, NULL, NULL, NULL, &error)) {
+ g_warning ("Failed to call '%s': %s\n", command, error->message);
+ g_error_free (error);
+ }
}
static void
gs_shell_updates_button_update_all_cb (GtkButton *button,
- GsShellUpdates *updates)
+ GsShellUpdates *updates)
{
- GDBusConnection *bus;
- const gchar *command;
- GError *error = NULL;
-
- command = "pkexec /usr/libexec/pk-trigger-offline-update";
- g_debug ("calling '%s'", command);
- if (!g_spawn_command_line_sync (command, NULL, NULL, NULL, &error)) {
- g_warning ("Failed to call '%s': %s\n", command, error->message);
- g_error_free (error);
- return;
- }
-
- g_debug ("calling org.gnome.SessionManager.Reboot");
- bus = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, NULL);
- g_dbus_connection_call (bus,
- "org.gnome.SessionManager",
- "/org/gnome/SessionManager",
- "org.gnome.SessionManager",
- "Reboot",
- NULL,
- NULL,
- G_DBUS_CALL_FLAGS_NONE,
- G_MAXINT,
- NULL,
- reboot_failed,
- NULL);
- g_object_unref (bus);
+ GDBusConnection *bus;
+ const gchar *command;
+ GError *error = NULL;
+
+ command = "pkexec /usr/libexec/pk-trigger-offline-update";
+ g_debug ("calling '%s'", command);
+ if (!g_spawn_command_line_sync (command, NULL, NULL, NULL, &error)) {
+ g_warning ("Failed to call '%s': %s\n", command, error->message);
+ g_error_free (error);
+ return;
+ }
+
+ g_debug ("calling org.gnome.SessionManager.Reboot");
+ bus = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, NULL);
+ g_dbus_connection_call (bus,
+ "org.gnome.SessionManager",
+ "/org/gnome/SessionManager",
+ "org.gnome.SessionManager",
+ "Reboot",
+ NULL,
+ NULL,
+ G_DBUS_CALL_FLAGS_NONE,
+ G_MAXINT,
+ NULL,
+ reboot_failed,
+ NULL);
+ g_object_unref (bus);
}
static void
scrollbar_mapped_cb (GtkWidget *sb, GtkScrolledWindow *swin)
{
- if (gtk_widget_get_mapped (GTK_WIDGET (sb)))
- gtk_scrolled_window_set_shadow_type (swin, GTK_SHADOW_IN);
- else
- gtk_scrolled_window_set_shadow_type (swin, GTK_SHADOW_NONE);
+ if (gtk_widget_get_mapped (GTK_WIDGET (sb)))
+ gtk_scrolled_window_set_shadow_type (swin, GTK_SHADOW_IN);
+ else
+ gtk_scrolled_window_set_shadow_type (swin, GTK_SHADOW_NONE);
}
static void
dialog_update_hide_cb (GtkWidget *dialog, GsShellUpdates *shell_updates)
{
- g_clear_object (&shell_updates->priv->app);
+ g_clear_object (&shell_updates->priv->app);
}
void
gs_shell_updates_setup (GsShellUpdates *shell_updates,
- GsShell *shell,
+ GsShell *shell,
GsPluginLoader *plugin_loader,
GtkBuilder *builder,
GCancellable *cancellable)
{
GsShellUpdatesPrivate *priv = shell_updates->priv;
GtkWidget *widget;
- GtkWidget *sw;
+ GtkWidget *sw;
g_return_if_fail (GS_IS_SHELL_UPDATES (shell_updates));
- priv->shell = shell;
+ priv->shell = shell;
priv->plugin_loader = g_object_ref (plugin_loader);
g_signal_connect (priv->plugin_loader, "pending-apps-changed",
@@ -493,7 +493,7 @@ gs_shell_updates_setup (GsShellUpdates *shell_updates,
shell_updates,
NULL);
- widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "list_box_update"));
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "list_box_update"));
g_signal_connect (GTK_LIST_BOX (widget), "row-activated",
G_CALLBACK (gs_shell_updates_row_activated_cb), shell_updates);
gtk_list_box_set_header_func (GTK_LIST_BOX (widget),
@@ -502,7 +502,7 @@ gs_shell_updates_setup (GsShellUpdates *shell_updates,
NULL);
widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "button_update_all"));
- g_signal_connect (widget, "clicked", G_CALLBACK (gs_shell_updates_button_update_all_cb),
shell_updates);
+ g_signal_connect (widget, "clicked", G_CALLBACK (gs_shell_updates_button_update_all_cb),
shell_updates);
/* setup update details window */
widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "button_update_close"));
@@ -512,17 +512,17 @@ gs_shell_updates_setup (GsShellUpdates *shell_updates,
widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "dialog_update"));
g_signal_connect (widget, "delete-event",
G_CALLBACK (gtk_widget_hide_on_delete), shell_updates);
- g_signal_connect (widget, "hide",
- G_CALLBACK (dialog_update_hide_cb), shell_updates);
+ g_signal_connect (widget, "hide",
+ G_CALLBACK (dialog_update_hide_cb), shell_updates);
widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "button_update_back"));
g_signal_connect (widget, "clicked",
G_CALLBACK (gs_shell_updates_button_back_cb),
shell_updates);
sw = GTK_WIDGET (gtk_builder_get_object (priv->builder, "scrolledwindow_update_details"));
- widget = gtk_scrolled_window_get_vscrollbar (GTK_SCROLLED_WINDOW (sw));
- g_signal_connect (widget, "map", G_CALLBACK (scrollbar_mapped_cb), sw);
- g_signal_connect (widget, "unmap", G_CALLBACK (scrollbar_mapped_cb), sw);
+ widget = gtk_scrolled_window_get_vscrollbar (GTK_SCROLLED_WINDOW (sw));
+ g_signal_connect (widget, "map", G_CALLBACK (scrollbar_mapped_cb), sw);
+ g_signal_connect (widget, "unmap", G_CALLBACK (scrollbar_mapped_cb), sw);
}
/**
@@ -558,7 +558,7 @@ gs_shell_updates_finalize (GObject *object)
g_object_unref (priv->builder);
g_object_unref (priv->plugin_loader);
g_object_unref (priv->cancellable);
- g_clear_object (&priv->app);
+ g_clear_object (&priv->app);
G_OBJECT_CLASS (gs_shell_updates_parent_class)->finalize (object);
}
diff --git a/src/gs-shell-updates.h b/src/gs-shell-updates.h
index 529e864..38aa180 100644
--- a/src/gs-shell-updates.h
+++ b/src/gs-shell-updates.h
@@ -33,7 +33,7 @@ G_BEGIN_DECLS
#define GS_TYPE_SHELL_UPDATES (gs_shell_updates_get_type ())
#define GS_SHELL_UPDATES(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GS_TYPE_SHELL_UPDATES,
GsShellUpdates))
#define GS_SHELL_UPDATES_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GS_TYPE_SHELL_UPDATES,
GsShellUpdatesClass))
-#define GS_IS_SHELL_UPDATES(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GS_TYPE_SHELL_UPDATES))
+#define GS_IS_SHELL_UPDATES(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GS_TYPE_SHELL_UPDATES))
#define GS_IS_SHELL_UPDATES_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GS_TYPE_SHELL_UPDATES))
#define GS_SHELL_UPDATES_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GS_TYPE_SHELL_UPDATES,
GsShellUpdatesClass))
@@ -55,9 +55,9 @@ GType gs_shell_updates_get_type (void);
GsShellUpdates *gs_shell_updates_new (void);
void gs_shell_updates_invalidate (GsShellUpdates *shell_updates);
void gs_shell_updates_refresh (GsShellUpdates *shell_updates,
- gboolean scroll_up);
-void gs_shell_updates_setup (GsShellUpdates *shell_updates,
- GsShell *shell,
+ gboolean scroll_up);
+void gs_shell_updates_setup (GsShellUpdates *shell_updates,
+ GsShell *shell,
GsPluginLoader *plugin_loader,
GtkBuilder *builder,
GCancellable *cancellable);
diff --git a/src/gs-shell.c b/src/gs-shell.c
index 5348847..52d1973 100644
--- a/src/gs-shell.c
+++ b/src/gs-shell.c
@@ -37,9 +37,9 @@ static void gs_shell_finalize (GObject *object);
#define GS_SHELL_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GS_TYPE_SHELL, GsShellPrivate))
typedef struct {
- GsShellMode mode;
- GsApp *app;
- GsCategory *category;
+ GsShellMode mode;
+ GsApp *app;
+ GsCategory *category;
} BackEntry;
struct GsShellPrivate
@@ -53,16 +53,16 @@ struct GsShellPrivate
GsShellSearch *shell_search;
GsShellUpdates *shell_updates;
GsShellDetails *shell_details;
- GsShellCategory *shell_category;
+ GsShellCategory *shell_category;
GtkBuilder *builder;
- GSList *back_entry_stack;
+ GSList *back_entry_stack;
};
G_DEFINE_TYPE (GsShell, gs_shell, G_TYPE_OBJECT)
enum {
- SIGNAL_LOADED,
- SIGNAL_LAST
+ SIGNAL_LOADED,
+ SIGNAL_LAST
};
static guint signals [SIGNAL_LAST] = { 0 };
@@ -82,25 +82,25 @@ static void
gs_shell_change_mode (GsShell *shell, GsShellMode mode, GsApp *app, GsCategory *category, gboolean scroll_up)
{
GsShellPrivate *priv = shell->priv;
- GtkWidget *widget;
- const gchar *text;
+ GtkWidget *widget;
+ const gchar *text;
if (priv->ignore_primary_buttons)
return;
- /* hide all mode specific header widgets here, they will be shown in the
- * refresh functions
- */
+ /* hide all mode specific header widgets here, they will be shown in the
+ * refresh functions
+ */
widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "button_update_all"));
gtk_widget_hide (widget);
widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "header_spinner"));
- gtk_spinner_stop (GTK_SPINNER (widget));
+ gtk_spinner_stop (GTK_SPINNER (widget));
gtk_widget_hide (widget);
widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "button_install"));
gtk_widget_hide (widget);
widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "button_remove"));
gtk_widget_hide (widget);
- widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "application_details_header"));
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "application_details_header"));
gtk_widget_hide (widget);
widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "button_back"));
gtk_widget_hide (widget);
@@ -109,7 +109,7 @@ gs_shell_change_mode (GsShell *shell, GsShellMode mode, GsApp *app, GsCategory *
widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "search_bar"));
gtk_widget_hide (widget);
- /* update main buttons according to mode */
+ /* update main buttons according to mode */
priv->ignore_primary_buttons = TRUE;
widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "button_all"));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), mode == GS_SHELL_MODE_OVERVIEW);
@@ -171,29 +171,29 @@ static void
save_back_entry (GsShell *shell)
{
GsShellPrivate *priv = shell->priv;
- BackEntry *entry;
+ BackEntry *entry;
- entry = g_new0 (BackEntry, 1);
- entry->mode = priv->mode;
+ entry = g_new0 (BackEntry, 1);
+ entry->mode = priv->mode;
- if (priv->mode == GS_SHELL_MODE_CATEGORY) {
- entry->category = gs_shell_category_get_category (priv->shell_category);
- g_object_ref (entry->category);
- }
- else if (priv->mode == GS_SHELL_MODE_DETAILS) {
- entry->app = gs_shell_details_get_app (priv->shell_details);
- g_object_ref (entry->app);
- }
+ if (priv->mode == GS_SHELL_MODE_CATEGORY) {
+ entry->category = gs_shell_category_get_category (priv->shell_category);
+ g_object_ref (entry->category);
+ }
+ else if (priv->mode == GS_SHELL_MODE_DETAILS) {
+ entry->app = gs_shell_details_get_app (priv->shell_details);
+ g_object_ref (entry->app);
+ }
- priv->back_entry_stack = g_slist_prepend (priv->back_entry_stack, entry);
+ priv->back_entry_stack = g_slist_prepend (priv->back_entry_stack, entry);
}
static void
free_back_entry (BackEntry *entry)
{
- g_clear_object (&entry->category);
- g_clear_object (&entry->app);
- g_free (entry);
+ g_clear_object (&entry->category);
+ g_clear_object (&entry->app);
+ g_free (entry);
}
/**
@@ -203,155 +203,155 @@ static void
gs_shell_back_button_cb (GtkWidget *widget, GsShell *shell)
{
GsShellPrivate *priv = shell->priv;
- BackEntry *entry;
+ BackEntry *entry;
- g_assert (priv->back_entry_stack);
- entry = priv->back_entry_stack->data;
- priv->back_entry_stack = g_slist_remove (priv->back_entry_stack, entry);
+ g_assert (priv->back_entry_stack);
+ entry = priv->back_entry_stack->data;
+ priv->back_entry_stack = g_slist_remove (priv->back_entry_stack, entry);
gs_shell_change_mode (shell, entry->mode, entry->app, entry->category, FALSE);
- free_back_entry (entry);
+ free_back_entry (entry);
}
static void
initial_overview_load_done (GsShellOverview *shell_overview, gpointer data)
{
- GsShell *shell = data;
+ GsShell *shell = data;
- g_signal_handlers_disconnect_by_func (shell_overview, initial_overview_load_done, data);
+ g_signal_handlers_disconnect_by_func (shell_overview, initial_overview_load_done, data);
gs_shell_updates_refresh (shell->priv->shell_updates, TRUE);
gs_shell_installed_refresh (shell->priv->shell_installed, TRUE);
- g_signal_emit (shell, signals[SIGNAL_LOADED], 0);
+ g_signal_emit (shell, signals[SIGNAL_LOADED], 0);
}
static void
gs_shell_search_activated_cb (GtkEntry *entry, GsShell *shell)
{
GsShellPrivate *priv = shell->priv;
- const gchar *text;
+ const gchar *text;
- text = gtk_entry_get_text (entry);
- if (text[0] == '\0')
- return;
+ text = gtk_entry_get_text (entry);
+ if (text[0] == '\0')
+ return;
- if (gs_shell_get_mode (shell) == GS_SHELL_MODE_SEARCH) {
- gs_shell_search_refresh (priv->shell_search, text);
- } else {
- gs_shell_change_mode (shell, GS_SHELL_MODE_SEARCH, NULL, NULL, TRUE);
- }
+ if (gs_shell_get_mode (shell) == GS_SHELL_MODE_SEARCH) {
+ gs_shell_search_refresh (priv->shell_search, text);
+ } else {
+ gs_shell_change_mode (shell, GS_SHELL_MODE_SEARCH, NULL, NULL, TRUE);
+ }
}
static gboolean
is_keynav_event (GdkEvent *event, guint keyval)
{
- GdkModifierType state = 0;
-
- gdk_event_get_state (event, &state);
-
- if (keyval == GDK_KEY_Tab ||
- keyval == GDK_KEY_KP_Tab ||
- keyval == GDK_KEY_Up ||
- keyval == GDK_KEY_KP_Up ||
- keyval == GDK_KEY_Down ||
- keyval == GDK_KEY_KP_Down ||
- keyval == GDK_KEY_Left ||
- keyval == GDK_KEY_KP_Left ||
- keyval == GDK_KEY_Right ||
- keyval == GDK_KEY_KP_Right ||
- keyval == GDK_KEY_Home ||
- keyval == GDK_KEY_KP_Home ||
- keyval == GDK_KEY_End ||
- keyval == GDK_KEY_KP_End ||
- keyval == GDK_KEY_Page_Up ||
- keyval == GDK_KEY_KP_Page_Up ||
- keyval == GDK_KEY_Page_Down ||
- keyval == GDK_KEY_KP_Page_Down ||
- ((state & (GDK_CONTROL_MASK | GDK_MOD1_MASK)) != 0))
- return TRUE;
-
- return FALSE;
+ GdkModifierType state = 0;
+
+ gdk_event_get_state (event, &state);
+
+ if (keyval == GDK_KEY_Tab ||
+ keyval == GDK_KEY_KP_Tab ||
+ keyval == GDK_KEY_Up ||
+ keyval == GDK_KEY_KP_Up ||
+ keyval == GDK_KEY_Down ||
+ keyval == GDK_KEY_KP_Down ||
+ keyval == GDK_KEY_Left ||
+ keyval == GDK_KEY_KP_Left ||
+ keyval == GDK_KEY_Right ||
+ keyval == GDK_KEY_KP_Right ||
+ keyval == GDK_KEY_Home ||
+ keyval == GDK_KEY_KP_Home ||
+ keyval == GDK_KEY_End ||
+ keyval == GDK_KEY_KP_End ||
+ keyval == GDK_KEY_Page_Up ||
+ keyval == GDK_KEY_KP_Page_Up ||
+ keyval == GDK_KEY_Page_Down ||
+ keyval == GDK_KEY_KP_Page_Down ||
+ ((state & (GDK_CONTROL_MASK | GDK_MOD1_MASK)) != 0))
+ return TRUE;
+
+ return FALSE;
}
static gboolean
entry_keypress_handler (GtkWidget *widget, GdkEvent *event, GsShell *shell)
{
- guint keyval;
- GtkWidget *entry;
+ guint keyval;
+ GtkWidget *entry;
- if (!gdk_event_get_keyval (event, &keyval) ||
- keyval != GDK_KEY_Escape)
- return GDK_EVENT_PROPAGATE;
+ if (!gdk_event_get_keyval (event, &keyval) ||
+ keyval != GDK_KEY_Escape)
+ return GDK_EVENT_PROPAGATE;
- entry = GTK_WIDGET (gtk_builder_get_object (shell->priv->builder, "entry_search"));
- gtk_entry_set_text (GTK_ENTRY (entry), "");
+ entry = GTK_WIDGET (gtk_builder_get_object (shell->priv->builder, "entry_search"));
+ gtk_entry_set_text (GTK_ENTRY (entry), "");
- return GDK_EVENT_STOP;
+ return GDK_EVENT_STOP;
}
static void
preedit_changed_cb (GtkEntry *entry, GtkWidget *popup, gboolean *preedit_changed)
{
- *preedit_changed = TRUE;
+ *preedit_changed = TRUE;
}
static gboolean
window_keypress_handler (GtkWidget *window, GdkEvent *event, GsShell *shell)
{
- GtkWidget *entry;
- guint keyval;
- gboolean handled;
- gboolean preedit_changed;
- guint preedit_change_id;
- gboolean res;
- gchar *old_text, *new_text;
+ GtkWidget *entry;
+ guint keyval;
+ gboolean handled;
+ gboolean preedit_changed;
+ guint preedit_change_id;
+ gboolean res;
+ gchar *old_text, *new_text;
- if (gs_shell_get_mode (shell) != GS_SHELL_MODE_OVERVIEW &&
- gs_shell_get_mode (shell) != GS_SHELL_MODE_SEARCH)
- return GDK_EVENT_PROPAGATE;
+ if (gs_shell_get_mode (shell) != GS_SHELL_MODE_OVERVIEW &&
+ gs_shell_get_mode (shell) != GS_SHELL_MODE_SEARCH)
+ return GDK_EVENT_PROPAGATE;
- if (!gdk_event_get_keyval (event, &keyval) ||
- is_keynav_event (event, keyval) ||
- keyval == GDK_KEY_space ||
- keyval == GDK_KEY_Menu)
- return GDK_EVENT_PROPAGATE;
+ if (!gdk_event_get_keyval (event, &keyval) ||
+ is_keynav_event (event, keyval) ||
+ keyval == GDK_KEY_space ||
+ keyval == GDK_KEY_Menu)
+ return GDK_EVENT_PROPAGATE;
- entry = GTK_WIDGET (gtk_builder_get_object (shell->priv->builder, "entry_search"));
+ entry = GTK_WIDGET (gtk_builder_get_object (shell->priv->builder, "entry_search"));
- handled = GDK_EVENT_PROPAGATE;
- preedit_changed = FALSE;
- preedit_change_id = g_signal_connect (entry, "preedit-changed",
- G_CALLBACK (preedit_changed_cb), &preedit_changed);
+ handled = GDK_EVENT_PROPAGATE;
+ preedit_changed = FALSE;
+ preedit_change_id = g_signal_connect (entry, "preedit-changed",
+ G_CALLBACK (preedit_changed_cb), &preedit_changed);
- old_text = g_strdup (gtk_entry_get_text (GTK_ENTRY (entry)));
- res = gtk_widget_event (entry, event);
- new_text = g_strdup (gtk_entry_get_text (GTK_ENTRY (entry)));
+ old_text = g_strdup (gtk_entry_get_text (GTK_ENTRY (entry)));
+ res = gtk_widget_event (entry, event);
+ new_text = g_strdup (gtk_entry_get_text (GTK_ENTRY (entry)));
- g_signal_handler_disconnect (entry, preedit_change_id);
+ g_signal_handler_disconnect (entry, preedit_change_id);
- if ((res && g_strcmp0 (new_text, old_text) != 0) ||
- preedit_changed)
- handled = GDK_EVENT_STOP;
+ if ((res && g_strcmp0 (new_text, old_text) != 0) ||
+ preedit_changed)
+ handled = GDK_EVENT_STOP;
- g_free (old_text);
- g_free (new_text);
+ g_free (old_text);
+ g_free (new_text);
- return handled;
+ return handled;
}
static void
text_changed_handler (GObject *entry, GParamSpec *pspec, GsShell *shell)
{
- const gchar *text;
+ const gchar *text;
- if (gs_shell_get_mode (shell) != GS_SHELL_MODE_SEARCH)
- return;
+ if (gs_shell_get_mode (shell) != GS_SHELL_MODE_SEARCH)
+ return;
- text = gtk_entry_get_text (GTK_ENTRY (entry));
- if (text[0] == '\0')
- gs_shell_change_mode (shell, GS_SHELL_MODE_OVERVIEW, NULL, NULL, TRUE);
+ text = gtk_entry_get_text (GTK_ENTRY (entry));
+ if (text[0] == '\0')
+ gs_shell_change_mode (shell, GS_SHELL_MODE_OVERVIEW, NULL, NULL, TRUE);
}
/**
@@ -376,13 +376,13 @@ gs_shell_setup (GsShell *shell, GsPluginLoader *plugin_loader, GCancellable *can
gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (),
GS_DATA G_DIR_SEPARATOR_S "icons");
- /* fix up the header bar */
+ /* fix up the header bar */
main_window = GTK_WIDGET (gtk_builder_get_object (priv->builder, "window_software"));
- widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "header"));
- g_object_ref (widget);
- gtk_container_remove (GTK_CONTAINER (gtk_widget_get_parent (widget)), widget);
- gtk_window_set_titlebar (GTK_WINDOW (main_window), widget);
- g_object_unref (widget);
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "header"));
+ g_object_ref (widget);
+ gtk_container_remove (GTK_CONTAINER (gtk_widget_get_parent (widget)), widget);
+ gtk_window_set_titlebar (GTK_WINDOW (main_window), widget);
+ g_object_unref (widget);
/* fix icon in RTL */
if (gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL)
@@ -415,53 +415,53 @@ gs_shell_setup (GsShell *shell, GsPluginLoader *plugin_loader, GCancellable *can
G_CALLBACK (gs_shell_overview_button_cb), shell);
gs_shell_overview_setup (priv->shell_overview,
- shell,
+ shell,
priv->plugin_loader,
priv->builder,
priv->cancellable);
gs_shell_updates_setup (priv->shell_updates,
- shell,
+ shell,
priv->plugin_loader,
priv->builder,
priv->cancellable);
gs_shell_installed_setup (priv->shell_installed,
- shell,
+ shell,
priv->plugin_loader,
priv->builder,
priv->cancellable);
gs_shell_search_setup (priv->shell_search,
- shell,
+ shell,
priv->plugin_loader,
priv->builder,
priv->cancellable);
gs_shell_details_setup (priv->shell_details,
- shell,
+ shell,
priv->plugin_loader,
priv->builder,
priv->cancellable);
gs_shell_category_setup (priv->shell_category,
- shell,
+ shell,
priv->plugin_loader,
priv->builder,
priv->cancellable);
- /* set up search */
- widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "entry_search"));
- g_signal_connect (GTK_EDITABLE (widget), "activate",
- G_CALLBACK (gs_shell_search_activated_cb), shell);
- widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "window_software"));
- g_signal_connect (widget, "key-press-event",
- G_CALLBACK (window_keypress_handler), shell);
- widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "entry_search"));
- g_signal_connect (widget, "key-press-event",
- G_CALLBACK (entry_keypress_handler), shell);
- g_signal_connect (widget, "notify::text",
- G_CALLBACK (text_changed_handler), shell);
-
- /* load content */
- g_signal_connect (priv->shell_overview, "refreshed",
- G_CALLBACK (initial_overview_load_done), shell);
- gs_shell_change_mode (shell, GS_SHELL_MODE_OVERVIEW, NULL, NULL, TRUE);
+ /* set up search */
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "entry_search"));
+ g_signal_connect (GTK_EDITABLE (widget), "activate",
+ G_CALLBACK (gs_shell_search_activated_cb), shell);
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "window_software"));
+ g_signal_connect (widget, "key-press-event",
+ G_CALLBACK (window_keypress_handler), shell);
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "entry_search"));
+ g_signal_connect (widget, "key-press-event",
+ G_CALLBACK (entry_keypress_handler), shell);
+ g_signal_connect (widget, "notify::text",
+ G_CALLBACK (text_changed_handler), shell);
+
+ /* load content */
+ g_signal_connect (priv->shell_overview, "refreshed",
+ G_CALLBACK (initial_overview_load_done), shell);
+ gs_shell_change_mode (shell, GS_SHELL_MODE_OVERVIEW, NULL, NULL, TRUE);
return GTK_WINDOW (main_window);
}
@@ -472,7 +472,7 @@ gs_shell_setup (GsShell *shell, GsPluginLoader *plugin_loader, GCancellable *can
void
gs_shell_set_mode (GsShell *shell, GsShellMode mode)
{
- gs_shell_change_mode (shell, mode, NULL, NULL, TRUE);
+ gs_shell_change_mode (shell, mode, NULL, NULL, TRUE);
}
GsShellMode
@@ -480,21 +480,21 @@ gs_shell_get_mode (GsShell *shell)
{
GsShellPrivate *priv = shell->priv;
- return priv->mode;
+ return priv->mode;
}
void
gs_shell_show_app (GsShell *shell, GsApp *app)
{
- save_back_entry (shell);
- gs_shell_change_mode (shell, GS_SHELL_MODE_DETAILS, app, NULL, TRUE);
+ save_back_entry (shell);
+ gs_shell_change_mode (shell, GS_SHELL_MODE_DETAILS, app, NULL, TRUE);
}
void
gs_shell_show_category (GsShell *shell, GsCategory *category)
{
- save_back_entry (shell);
- gs_shell_change_mode (shell, GS_SHELL_MODE_CATEGORY, NULL, category, TRUE);
+ save_back_entry (shell);
+ gs_shell_change_mode (shell, GS_SHELL_MODE_CATEGORY, NULL, category, TRUE);
}
/**
@@ -507,11 +507,11 @@ gs_shell_class_init (GsShellClass *klass)
object_class->finalize = gs_shell_finalize;
signals [SIGNAL_LOADED] =
- g_signal_new ("loaded",
- G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (GsShellClass, loaded),
- NULL, NULL, g_cclosure_marshal_VOID__VOID,
- G_TYPE_NONE, 0);
+ g_signal_new ("loaded",
+ G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (GsShellClass, loaded),
+ NULL, NULL, g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
g_type_class_add_private (klass, sizeof (GsShellPrivate));
}
diff --git a/src/gs-shell.h b/src/gs-shell.h
index 18a74d8..0f1e7b4 100644
--- a/src/gs-shell.h
+++ b/src/gs-shell.h
@@ -42,15 +42,15 @@ typedef struct GsShellPrivate GsShellPrivate;
typedef struct
{
- GObject parent;
- GsShellPrivate *priv;
+ GObject parent;
+ GsShellPrivate *priv;
} GsShell;
typedef struct
{
GObjectClass parent_class;
- void (* loaded) (GsShell *shell);
+ void (* loaded) (GsShell *shell);
} GsShellClass;
typedef enum {
@@ -68,13 +68,13 @@ GsShell *gs_shell_new (void);
void gs_shell_activate (GsShell *shell);
void gs_shell_refresh (GsShell *shell,
GCancellable *cancellable);
-void gs_shell_set_mode (GsShell *shell,
+void gs_shell_set_mode (GsShell *shell,
GsShellMode mode);
-GsShellMode gs_shell_get_mode (GsShell *shell);
-void gs_shell_show_app (GsShell *shell,
- GsApp *app);
-void gs_shell_show_category (GsShell *shell,
- GsCategory *category);
+GsShellMode gs_shell_get_mode (GsShell *shell);
+void gs_shell_show_app (GsShell *shell,
+ GsApp *app);
+void gs_shell_show_category (GsShell *shell,
+ GsCategory *category);
GtkWindow *gs_shell_setup (GsShell *shell,
GsPluginLoader *plugin_loader,
GCancellable *cancellable);
diff --git a/src/gs-utils.c b/src/gs-utils.c
index c2d9c27..2aa0add 100644
--- a/src/gs-utils.c
+++ b/src/gs-utils.c
@@ -33,180 +33,179 @@
static gboolean
fade_in (gpointer data)
{
- GtkWidget *spinner = data;
- gdouble opacity;
+ GtkWidget *spinner = data;
+ gdouble opacity;
- opacity = gtk_widget_get_opacity (spinner);
- opacity = opacity + 0.1;
- gtk_widget_set_opacity (spinner, opacity);
+ opacity = gtk_widget_get_opacity (spinner);
+ opacity = opacity + 0.1;
+ gtk_widget_set_opacity (spinner, opacity);
- if (opacity >= 1.0)
- return G_SOURCE_REMOVE;
+ if (opacity >= 1.0)
+ return G_SOURCE_REMOVE;
- return G_SOURCE_CONTINUE;
+ return G_SOURCE_CONTINUE;
}
static void
remove_source (gpointer data)
{
- g_source_remove (GPOINTER_TO_UINT (data));
+ g_source_remove (GPOINTER_TO_UINT (data));
}
static gboolean
start_spinning (gpointer data)
{
- GtkWidget *spinner = data;
- guint id;
+ GtkWidget *spinner = data;
+ guint id;
- gtk_widget_set_opacity (spinner, 0);
- gtk_spinner_start (GTK_SPINNER (spinner));
- id = g_timeout_add (100, fade_in, spinner);
- g_object_set_data_full (G_OBJECT (spinner), "fade-timeout",
- GUINT_TO_POINTER (id), remove_source);
+ gtk_widget_set_opacity (spinner, 0);
+ gtk_spinner_start (GTK_SPINNER (spinner));
+ id = g_timeout_add (100, fade_in, spinner);
+ g_object_set_data_full (G_OBJECT (spinner), "fade-timeout",
+ GUINT_TO_POINTER (id), remove_source);
- return G_SOURCE_REMOVE;
+ return G_SOURCE_REMOVE;
}
void
gs_stop_spinner (GtkSpinner *spinner)
{
- gtk_spinner_stop (spinner);
+ gtk_spinner_stop (spinner);
}
void
gs_start_spinner (GtkSpinner *spinner)
{
- guint id;
+ guint id;
- gtk_widget_set_opacity (GTK_WIDGET (spinner), 0);
- id = g_timeout_add (SPINNER_DELAY, start_spinning, spinner);
+ gtk_widget_set_opacity (GTK_WIDGET (spinner), 0);
+ id = g_timeout_add (SPINNER_DELAY, start_spinning, spinner);
- g_object_set_data_full (G_OBJECT (spinner), "start-timeout",
- GUINT_TO_POINTER (id), remove_source);
+ g_object_set_data_full (G_OBJECT (spinner), "start-timeout",
+ GUINT_TO_POINTER (id), remove_source);
}
static void
remove_all_cb (GtkWidget *widget, gpointer user_data)
{
- GtkContainer *container = GTK_CONTAINER (user_data);
- gtk_container_remove (container, widget);
+ GtkContainer *container = GTK_CONTAINER (user_data);
+ gtk_container_remove (container, widget);
}
void
gs_container_remove_all (GtkContainer *container)
{
- gtk_container_foreach (container, remove_all_cb, container);
+ gtk_container_foreach (container, remove_all_cb, container);
}
static void
grab_focus (GtkWidget *widget)
{
- g_signal_handlers_disconnect_by_func (widget, grab_focus, NULL);
- gtk_widget_grab_focus (widget);
+ g_signal_handlers_disconnect_by_func (widget, grab_focus, NULL);
+ gtk_widget_grab_focus (widget);
}
void
gs_grab_focus_when_mapped (GtkWidget *widget)
{
- if (gtk_widget_get_mapped (widget))
- gtk_widget_grab_focus (widget);
- else
- g_signal_connect_after (widget, "map",
- G_CALLBACK (grab_focus), NULL);
+ if (gtk_widget_get_mapped (widget))
+ gtk_widget_grab_focus (widget);
+ else
+ g_signal_connect_after (widget, "map",
+ G_CALLBACK (grab_focus), NULL);
}
-
static void
launch_app (NotifyNotification *n, gchar *action, gpointer data)
{
- GsApp *app = data;
- GdkDisplay *display;
- GAppLaunchContext *context;
- gchar *id;
- GAppInfo *appinfo;
- GError *error = NULL;
-
- notify_notification_close (n, NULL);
- if (g_strcmp0 (action, "launch") == 0) {
- display = gdk_display_get_default ();
- id = g_strconcat (gs_app_get_id (app), ".desktop", NULL);
- appinfo = G_APP_INFO (g_desktop_app_info_new (id));
- if (!appinfo) {
- g_warning ("no such desktop file: %s", id);
- goto out;
- }
- g_free (id);
-
- context = G_APP_LAUNCH_CONTEXT (gdk_display_get_app_launch_context (display));
- if (!g_app_info_launch (appinfo, NULL, context, &error)) {
- g_warning ("launching %s failed: %s",
- gs_app_get_id (app), error->message);
- g_error_free (error);
- }
-
- g_object_unref (appinfo);
- g_object_unref (context);
- }
+ GsApp *app = data;
+ GdkDisplay *display;
+ GAppLaunchContext *context;
+ gchar *id;
+ GAppInfo *appinfo;
+ GError *error = NULL;
+
+ notify_notification_close (n, NULL);
+ if (g_strcmp0 (action, "launch") == 0) {
+ display = gdk_display_get_default ();
+ id = g_strconcat (gs_app_get_id (app), ".desktop", NULL);
+ appinfo = G_APP_INFO (g_desktop_app_info_new (id));
+ if (!appinfo) {
+ g_warning ("no such desktop file: %s", id);
+ goto out;
+ }
+ g_free (id);
+
+ context = G_APP_LAUNCH_CONTEXT (gdk_display_get_app_launch_context (display));
+ if (!g_app_info_launch (appinfo, NULL, context, &error)) {
+ g_warning ("launching %s failed: %s",
+ gs_app_get_id (app), error->message);
+ g_error_free (error);
+ }
+
+ g_object_unref (appinfo);
+ g_object_unref (context);
+ }
out: ;
}
static void
on_notification_closed (NotifyNotification *n, gpointer data)
{
- g_object_unref (n);
+ g_object_unref (n);
}
void
gs_app_notify_installed (GsApp *app)
{
- gchar *summary;
- NotifyNotification *n;
+ gchar *summary;
+ NotifyNotification *n;
- summary = g_strdup_printf (_("%s is now installed"), gs_app_get_name (app));
- n = notify_notification_new (summary, NULL, "system-software-install");
- notify_notification_add_action (n, "launch", _("Launch"),
- launch_app, g_object_ref (app), g_object_unref);
- g_signal_connect (n, "closed", G_CALLBACK (on_notification_closed), NULL);
- notify_notification_show (n, NULL);
+ summary = g_strdup_printf (_("%s is now installed"), gs_app_get_name (app));
+ n = notify_notification_new (summary, NULL, "system-software-install");
+ notify_notification_add_action (n, "launch", _("Launch"),
+ launch_app, g_object_ref (app), g_object_unref);
+ g_signal_connect (n, "closed", G_CALLBACK (on_notification_closed), NULL);
+ notify_notification_show (n, NULL);
- g_free (summary);
+ g_free (summary);
}
guint
gs_string_replace (GString *string, const gchar *search, const gchar *replace)
{
- gchar *tmp;
- guint count = 0;
- guint replace_len;
- guint search_len;
-
- search_len = strlen (search);
- replace_len = strlen (replace);
-
- do {
- tmp = g_strstr_len (string->str, -1, search);
- if (tmp == NULL)
- goto out;
-
- /* reallocate the string if required */
- if (search_len > replace_len) {
- g_string_erase (string,
- tmp - string->str,
-- search_len - replace_len);
- }
- if (search_len < replace_len) {
- g_string_insert_len (string,
- tmp - string->str,
- search,
- replace_len - search_len);
- }
-
- /* just memcmp in the new string */
- memcpy (tmp, replace, replace_len);
- count++;
- } while (TRUE);
+ gchar *tmp;
+ guint count = 0;
+ guint replace_len;
+ guint search_len;
+
+ search_len = strlen (search);
+ replace_len = strlen (replace);
+
+ do {
+ tmp = g_strstr_len (string->str, -1, search);
+ if (tmp == NULL)
+ goto out;
+
+ /* reallocate the string if required */
+ if (search_len > replace_len) {
+ g_string_erase (string,
+ tmp - string->str,
+- search_len - replace_len);
+ }
+ if (search_len < replace_len) {
+ g_string_insert_len (string,
+ tmp - string->str,
+ search,
+ replace_len - search_len);
+ }
+
+ /* just memcmp in the new string */
+ memcpy (tmp, replace, replace_len);
+ count++;
+ } while (TRUE);
out:
- return count;
+ return count;
}
/* vim: set noexpandtab: */
diff --git a/src/gs-utils.h b/src/gs-utils.h
index 79129c4..c139454 100644
--- a/src/gs-utils.h
+++ b/src/gs-utils.h
@@ -28,14 +28,16 @@
G_BEGIN_DECLS
-void gs_start_spinner (GtkSpinner *spinner);
-void gs_stop_spinner (GtkSpinner *spinner);
-void gs_container_remove_all (GtkContainer *container);
-void gs_grab_focus_when_mapped (GtkWidget *widget);
+void gs_start_spinner (GtkSpinner *spinner);
+void gs_stop_spinner (GtkSpinner *spinner);
+void gs_container_remove_all (GtkContainer *container);
+void gs_grab_focus_when_mapped (GtkWidget *widget);
-void gs_app_notify_installed (GsApp *app);
+void gs_app_notify_installed (GsApp *app);
-guint gs_string_replace (GString *string, const gchar *search, const gchar *replace);
+guint gs_string_replace (GString *string,
+ const gchar *search,
+ const gchar *replace);
G_END_DECLS
diff --git a/src/plugins/appstream-app.c b/src/plugins/appstream-app.c
index fd58b88..9e6afab 100644
--- a/src/plugins/appstream-app.c
+++ b/src/plugins/appstream-app.c
@@ -190,7 +190,7 @@ appstream_app_get_icon (AppstreamApp *app)
/**
* appstream_app_get_icon_kind:
*/
-AppstreamAppIconKind
+AppstreamAppIconKind
appstream_app_get_icon_kind (AppstreamApp *app)
{
return app->icon_kind;
@@ -199,7 +199,7 @@ appstream_app_get_icon_kind (AppstreamApp *app)
/**
* appstream_app_has_category:
*/
-gboolean
+gboolean
appstream_app_has_category (AppstreamApp *app, const gchar *category)
{
const gchar *tmp;
@@ -216,7 +216,7 @@ appstream_app_has_category (AppstreamApp *app, const gchar *category)
/**
* appstream_app_set_id:
*/
-void
+void
appstream_app_set_id (AppstreamApp *app,
const gchar *id,
gsize length)
@@ -227,7 +227,7 @@ appstream_app_set_id (AppstreamApp *app,
/**
* appstream_app_set_pkgname:
*/
-void
+void
appstream_app_set_pkgname (AppstreamApp *app,
const gchar *pkgname,
gsize length)
@@ -238,7 +238,7 @@ appstream_app_set_pkgname (AppstreamApp *app,
/**
* appstream_app_set_name:
*/
-void
+void
appstream_app_set_name (AppstreamApp *app,
const gchar *lang,
const gchar *name,
@@ -257,7 +257,7 @@ appstream_app_set_name (AppstreamApp *app,
/**
* appstream_app_set_summary:
*/
-void
+void
appstream_app_set_summary (AppstreamApp *app,
const gchar *lang,
const gchar *summary,
@@ -276,7 +276,7 @@ appstream_app_set_summary (AppstreamApp *app,
/**
* appstream_app_set_url:
*/
-void
+void
appstream_app_set_url (AppstreamApp *app,
const gchar *url,
gsize length)
@@ -287,7 +287,7 @@ appstream_app_set_url (AppstreamApp *app,
/**
* appstream_app_set_description:
*/
-void
+void
appstream_app_set_description (AppstreamApp *app,
const gchar *lang,
const gchar *description,
@@ -306,7 +306,7 @@ appstream_app_set_description (AppstreamApp *app,
/**
* appstream_app_set_icon:
*/
-void
+void
appstream_app_set_icon (AppstreamApp *app,
const gchar *icon,
gsize length)
@@ -317,7 +317,7 @@ appstream_app_set_icon (AppstreamApp *app,
/**
* appstream_app_add_category:
*/
-void
+void
appstream_app_add_category (AppstreamApp *app,
const gchar *category,
gsize length)
@@ -329,7 +329,7 @@ appstream_app_add_category (AppstreamApp *app,
/**
* appstream_app_set_icon_kind:
*/
-void
+void
appstream_app_set_icon_kind (AppstreamApp *app,
AppstreamAppIconKind icon_kind)
{
diff --git a/src/plugins/appstream-cache.c b/src/plugins/appstream-cache.c
index 5c9fe40..774138f 100644
--- a/src/plugins/appstream-cache.c
+++ b/src/plugins/appstream-cache.c
@@ -130,7 +130,7 @@ appstream_cache_selection_from_string (const gchar *element_name)
if (g_strcmp0 (element_name, "icon") == 0)
return APPSTREAM_CACHE_SECTION_ICON;
if (g_strcmp0 (element_name, "appcategories") == 0)
- return APPSTREAM_CACHE_SECTION_APPCATEGORIES;
+ return APPSTREAM_CACHE_SECTION_APPCATEGORIES;
if (g_strcmp0 (element_name, "appcategory") == 0)
return APPSTREAM_CACHE_SECTION_APPCATEGORY;
return APPSTREAM_CACHE_SECTION_UNKNOWN;
@@ -184,7 +184,7 @@ appstream_cache_icon_kind_from_string (const gchar *kind_str)
typedef struct {
const gchar *path_icons;
AppstreamApp *item_temp;
- char *lang_temp;
+ char *lang_temp;
AppstreamCache *cache;
AppstreamCacheSection section;
} AppstreamCacheHelper;
diff --git a/src/plugins/gs-plugin-datadir-apps.c b/src/plugins/gs-plugin-datadir-apps.c
index 925719b..dbefc0a 100644
--- a/src/plugins/gs-plugin-datadir-apps.c
+++ b/src/plugins/gs-plugin-datadir-apps.c
@@ -25,8 +25,8 @@
#include <gs-plugin.h>
struct GsPluginPrivate {
- GMutex plugin_mutex;
- GHashTable *cache;
+ GMutex plugin_mutex;
+ GHashTable *cache;
};
typedef struct {
diff --git a/src/plugins/gs-plugin-datadir-filename.c b/src/plugins/gs-plugin-datadir-filename.c
index 654e05b..43b14a8 100644
--- a/src/plugins/gs-plugin-datadir-filename.c
+++ b/src/plugins/gs-plugin-datadir-filename.c
@@ -24,8 +24,8 @@
#include <gs-plugin.h>
struct GsPluginPrivate {
- GMutex plugin_mutex;
- GHashTable *cache;
+ GMutex plugin_mutex;
+ GHashTable *cache;
};
/**
diff --git a/src/plugins/gs-plugin-desktopdb.c b/src/plugins/gs-plugin-desktopdb.c
index 02a25ef..429dc24 100644
--- a/src/plugins/gs-plugin-desktopdb.c
+++ b/src/plugins/gs-plugin-desktopdb.c
@@ -29,10 +29,10 @@
#include <gs-plugin.h>
struct GsPluginPrivate {
- PkDesktop *desktop;
- gsize loaded;
- GMutex plugin_mutex;
- GHashTable *cache;
+ PkDesktop *desktop;
+ gsize loaded;
+ GMutex plugin_mutex;
+ GHashTable *cache;
};
/**
diff --git a/src/plugins/gs-plugin-hardcoded-featured.c b/src/plugins/gs-plugin-hardcoded-featured.c
index b223bdc..946842f 100644
--- a/src/plugins/gs-plugin-hardcoded-featured.c
+++ b/src/plugins/gs-plugin-hardcoded-featured.c
@@ -46,83 +46,83 @@ gs_plugin_get_priority (GsPlugin *plugin)
*/
gboolean
gs_plugin_add_featured (GsPlugin *plugin,
- GList **list,
- GCancellable *cancellable,
- GError **error)
+ GList **list,
+ GCancellable *cancellable,
+ GError **error)
{
gboolean ret = TRUE;
gchar *path;
GsApp *app;
guint i;
- GDateTime *date;
- gchar **apps;
- gsize n_apps;
- GError *local_error = NULL;
- GKeyFile *kf;
- gchar *s;
- const gchar *group;
+ GDateTime *date;
+ gchar **apps;
+ gsize n_apps;
+ GError *local_error = NULL;
+ GKeyFile *kf;
+ gchar *s;
+ const gchar *group;
- apps = NULL;
+ apps = NULL;
- path = g_build_filename (DATADIR, "gnome-software", "featured.ini", NULL);
- kf = g_key_file_new ();
- if (!g_key_file_load_from_file (kf, path, 0, &local_error)) {
- g_warning ("Failed to read %s: %s", path, local_error->message);
- ret = FALSE;
- goto out;
- }
- g_free (path);
+ path = g_build_filename (DATADIR, "gnome-software", "featured.ini", NULL);
+ kf = g_key_file_new ();
+ if (!g_key_file_load_from_file (kf, path, 0, &local_error)) {
+ g_warning ("Failed to read %s: %s", path, local_error->message);
+ ret = FALSE;
+ goto out;
+ }
+ g_free (path);
- apps = g_key_file_get_groups (kf, &n_apps)
+ apps = g_key_file_get_groups (kf, &n_apps)
;
- group = NULL;
+ group = NULL;
#ifdef DEBUG
- if (g_getenv ("GNOME_SOFTWARE_FEATURED")) {
- const gchar *featured;
- featured = g_getenv ("GNOME_SOFTWARE_FEATURED");
- for (i = 0; apps[i]; i++) {
- if (g_strcmp0 (apps[i], featured) == 0) {
- group = featured;
- break;
- }
- }
- }
+ if (g_getenv ("GNOME_SOFTWARE_FEATURED")) {
+ const gchar *featured;
+ featured = g_getenv ("GNOME_SOFTWARE_FEATURED");
+ for (i = 0; apps[i]; i++) {
+ if (g_strcmp0 (apps[i], featured) == 0) {
+ group = featured;
+ break;
+ }
+ }
+ }
#endif
- if (!group) {
- /* In lieu of a random number generator, just
- * rotate the featured apps, giving each app
- * 3 days apiece.
- */
- date = g_date_time_new_now_utc ();
- i = g_date_time_get_day_of_year (date);
- g_date_time_unref (date);
- i = (i % (n_apps * 3)) / 3;
- group = apps[i];
- }
+ if (!group) {
+ /* In lieu of a random number generator, just
+ * rotate the featured apps, giving each app
+ * 3 days apiece.
+ */
+ date = g_date_time_new_now_utc ();
+ i = g_date_time_get_day_of_year (date);
+ g_date_time_unref (date);
+ i = (i % (n_apps * 3)) / 3;
+ group = apps[i];
+ }
- app = gs_app_new (group);
- s = g_key_file_get_string (kf, group, "background", NULL);
- if (s) {
- gs_app_set_metadata (app, "Featured::background", s);
- g_free (s);
- }
- s = g_key_file_get_string (kf, group, "stroke", NULL);
- if (s) {
- gs_app_set_metadata (app, "Featured::stroke-color", s);
- g_free (s);
- }
- s = g_key_file_get_string (kf, group, "text", NULL);
- if (s) {
- gs_app_set_metadata (app, "Featured::text-color", s);
- g_free (s);
- }
+ app = gs_app_new (group);
+ s = g_key_file_get_string (kf, group, "background", NULL);
+ if (s) {
+ gs_app_set_metadata (app, "Featured::background", s);
+ g_free (s);
+ }
+ s = g_key_file_get_string (kf, group, "stroke", NULL);
+ if (s) {
+ gs_app_set_metadata (app, "Featured::stroke-color", s);
+ g_free (s);
+ }
+ s = g_key_file_get_string (kf, group, "text", NULL);
+ if (s) {
+ gs_app_set_metadata (app, "Featured::text-color", s);
+ g_free (s);
+ }
gs_plugin_add_app (list, app);
out:
- g_strfreev (apps);
+ g_strfreev (apps);
return ret;
}
diff --git a/src/plugins/gs-plugin-hardcoded-popular.c b/src/plugins/gs-plugin-hardcoded-popular.c
index 2544c5e..e688f7b 100644
--- a/src/plugins/gs-plugin-hardcoded-popular.c
+++ b/src/plugins/gs-plugin-hardcoded-popular.c
@@ -53,58 +53,58 @@ gs_plugin_add_popular (GsPlugin *plugin,
GsApp *app;
const gchar *apps[] = {
"transmission-gtk",
- "inkscape",
- "scribus",
- "simple-scan",
- "tomboy",
- "gtg",
- "stellarium",
- "gnome-maps",
- "calibre",
- "hotot-gtk",
- "musique",
- "sol", /* aisleriot */
- "shutter",
- "gnucash",
- "iagno",
- "mozilla-thunderbird",
- "geary",
- "pdfshuffler"
- };
- gint primes[] = {
- 2, 3, 5, 7, 11, 13, 17, 19, 23, 29,
- 31, 37, 41, 43, 47, 53, 59, 61, 67, 71,
- 73, 79, 83
- };
- GDateTime *date;
- gboolean hit[G_N_ELEMENTS (apps)];
- const gint n = G_N_ELEMENTS (apps);
- gint d, i, k;
+ "inkscape",
+ "scribus",
+ "simple-scan",
+ "tomboy",
+ "gtg",
+ "stellarium",
+ "gnome-maps",
+ "calibre",
+ "hotot-gtk",
+ "musique",
+ "sol", /* aisleriot */
+ "shutter",
+ "gnucash",
+ "iagno",
+ "mozilla-thunderbird",
+ "geary",
+ "pdfshuffler"
+ };
+ gint primes[] = {
+ 2, 3, 5, 7, 11, 13, 17, 19, 23, 29,
+ 31, 37, 41, 43, 47, 53, 59, 61, 67, 71,
+ 73, 79, 83
+ };
+ GDateTime *date;
+ gboolean hit[G_N_ELEMENTS (apps)];
+ const gint n = G_N_ELEMENTS (apps);
+ gint d, i, k;
- if (g_getenv ("GNOME_SOFTWARE_POPULAR")) {
- gchar **popular;
+ if (g_getenv ("GNOME_SOFTWARE_POPULAR")) {
+ gchar **popular;
- popular = g_strsplit (g_getenv ("GNOME_SOFTWARE_POPULAR"), ",", 0);
- for (i = 0; popular[i]; i++) {
- app = gs_app_new (popular[i]);
- gs_plugin_add_app (list, app);
- }
+ popular = g_strsplit (g_getenv ("GNOME_SOFTWARE_POPULAR"), ",", 0);
+ for (i = 0; popular[i]; i++) {
+ app = gs_app_new (popular[i]);
+ gs_plugin_add_app (list, app);
+ }
- g_strfreev (popular);
- return TRUE;
- }
+ g_strfreev (popular);
+ return TRUE;
+ }
- date = g_date_time_new_now_utc ();
- d = (((gint)g_date_time_get_day_of_year (date)) % (G_N_ELEMENTS (primes) * 3)) / 3;
- g_date_time_unref (date);
+ date = g_date_time_new_now_utc ();
+ d = (((gint)g_date_time_get_day_of_year (date)) % (G_N_ELEMENTS (primes) * 3)) / 3;
+ g_date_time_unref (date);
- for (i = 0; i < n; i++) hit[i] = 0;
+ for (i = 0; i < n; i++) hit[i] = 0;
- i = d % n;
- for (k = 0; k < n; k++) {
- i = (i + primes[d]) % n;
- while (hit[i]) i = (i + 1) % n;
- hit[i] = 1;
+ i = d % n;
+ for (k = 0; k < n; k++) {
+ i = (i + primes[d]) % n;
+ while (hit[i]) i = (i + 1) % n;
+ hit[i] = 1;
app = gs_app_new (apps[i]);
gs_plugin_add_app (list, app);
diff --git a/src/plugins/gs-plugin-hardcoded-ratings.c b/src/plugins/gs-plugin-hardcoded-ratings.c
index 65de8e5..ac16b3f 100644
--- a/src/plugins/gs-plugin-hardcoded-ratings.c
+++ b/src/plugins/gs-plugin-hardcoded-ratings.c
@@ -24,8 +24,8 @@
#include <gs-plugin.h>
struct GsPluginPrivate {
- GHashTable *cache;
- gsize loaded;
+ GHashTable *cache;
+ gsize loaded;
};
/**
diff --git a/src/plugins/gs-plugin-packagekit-refine.c b/src/plugins/gs-plugin-packagekit-refine.c
index 5cf882e..97bf263 100644
--- a/src/plugins/gs-plugin-packagekit-refine.c
+++ b/src/plugins/gs-plugin-packagekit-refine.c
@@ -223,11 +223,11 @@ out:
}
static gboolean
-gs_plugin_packagekit_refine_from_desktop (GsPlugin *plugin,
- GsApp *app,
- const char *filename,
- GCancellable *cancellable,
- GError **error)
+gs_plugin_packagekit_refine_from_desktop (GsPlugin *plugin,
+ GsApp *app,
+ const gchar *filename,
+ GCancellable *cancellable,
+ GError **error)
{
const gchar *to_array[] = { NULL, NULL };
gboolean ret = TRUE;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
