gnome-packagekit r235 - in trunk: data src
- From: rhughes svn gnome org
- To: svn-commits-list gnome org
- Subject: gnome-packagekit r235 - in trunk: data src
- Date: Thu, 26 Jun 2008 12:15:09 +0000 (UTC)
Author: rhughes
Date: Thu Jun 26 12:15:09 2008
New Revision: 235
URL: http://svn.gnome.org/viewvc/gnome-packagekit?rev=235&view=rev
Log:
from git
Modified:
trunk/data/gpk-log.desktop.in
trunk/data/gpk-update-viewer.glade
trunk/src/gpk-application.c
trunk/src/gpk-check-update.c
trunk/src/gpk-client-chooser.c
trunk/src/gpk-client-depends.c
trunk/src/gpk-client-requires.c
trunk/src/gpk-client-resolve.c
trunk/src/gpk-client.c
trunk/src/gpk-interface.h
trunk/src/gpk-update-viewer.c
Modified: trunk/data/gpk-log.desktop.in
==============================================================================
--- trunk/data/gpk-log.desktop.in (original)
+++ trunk/data/gpk-log.desktop.in Thu Jun 26 12:15:09 2008
@@ -8,6 +8,5 @@
Terminal=false
Type=Application
Categories=GNOME;GTK;System;X-Red-Hat-Base;
-NoDisplay=true
StartupNotify=true
Modified: trunk/data/gpk-update-viewer.glade
==============================================================================
--- trunk/data/gpk-update-viewer.glade (original)
+++ trunk/data/gpk-update-viewer.glade Thu Jun 26 12:15:09 2008
@@ -93,27 +93,32 @@
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox1">
+ <widget class="GtkHBox" id="hbox1">
<property name="visible">True</property>
+ <property name="spacing">6</property>
<child>
<widget class="GtkTable" id="time_table">
<property name="visible">True</property>
<property name="n_rows">2</property>
- <property name="n_columns">3</property>
+ <property name="n_columns">2</property>
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkLabel" id="label_last_update">
+ <widget class="GtkLabel" id="label_last_refresh_title">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label">Unknown....</property>
+ <property name="label" translatable="yes">Last refresh:</property>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label_last_update_title">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Last update:</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -125,78 +130,45 @@
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="x_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label1">
+ <widget class="GtkLabel" id="label_last_update">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Last update:</property>
+ <property name="label">Unknown....</property>
</widget>
<packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label5">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Last refresh:</property>
- </widget>
- <packing>
- <property name="x_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkAlignment" id="alignment_refresh">
- <property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <widget class="Custom" id="button_refresh">
- <property name="visible">True</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
</packing>
</child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkAlignment" id="alignment_refresh">
+ <property name="visible">True</property>
+ <property name="xalign">1</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
<child>
- <widget class="GtkAlignment" id="alignment1">
+ <widget class="Custom" id="button_refresh">
<property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <widget class="GtkButton" id="button_history">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="label" translatable="yes">View History</property>
- <property name="response_id">0</property>
- </widget>
- </child>
</widget>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- </packing>
</child>
</widget>
<packing>
- <property name="expand">False</property>
+ <property name="position">1</property>
</packing>
</child>
</widget>
<packing>
+ <property name="expand">False</property>
<property name="position">3</property>
</packing>
</child>
Modified: trunk/src/gpk-application.c
==============================================================================
--- trunk/src/gpk-application.c (original)
+++ trunk/src/gpk-application.c Thu Jun 26 12:15:09 2008
@@ -43,7 +43,7 @@
#include <pk-package-ids.h>
#include <pk-package-list.h>
#include <pk-extra.h>
-#include <pk-details.h>
+#include <pk-details-obj.h>
#include <gpk-client.h>
#include <gpk-common.h>
@@ -837,7 +837,7 @@
* gpk_application_details_cb:
**/
static void
-gpk_application_details_cb (PkClient *client, PkDetails *details, GpkApplication *application)
+gpk_application_details_cb (PkClient *client, PkDetailsObj *details, GpkApplication *application)
{
GtkWidget *widget;
gchar *text;
@@ -3008,10 +3008,21 @@
GROUPS_COLUMN_NAME, _("All packages"),
GROUPS_COLUMN_ID, "all-packages",
GROUPS_COLUMN_ICON, icon_name, -1);
+ }
+
+ /* only if we can do both */
+ if (pk_enums_contain (application->priv->roles, PK_ROLE_ENUM_GET_PACKAGES) &&
+ pk_enums_contain (application->priv->roles, PK_ROLE_ENUM_SEARCH_GROUP)) {
+ GtkTreeIter iter;
+
/* add a separator */
gtk_list_store_append (application->priv->groups_store, &iter);
gtk_list_store_set (application->priv->groups_store, &iter,
GROUPS_COLUMN_ID, "separator", -1);
+
+ /* use the seporator */
+ gtk_tree_view_set_row_separator_func (GTK_TREE_VIEW (widget),
+ gpk_application_group_row_separator_func, NULL, NULL);
}
/* create group tree view if we can search by group */
@@ -3035,10 +3046,6 @@
}
}
- /* use a seporator */
- gtk_tree_view_set_row_separator_func (GTK_TREE_VIEW (widget),
- gpk_application_group_row_separator_func, NULL, NULL);
-
/* get repos, so we can show the full name in the software source box */
ret = pk_client_get_repo_list (application->priv->client_action, PK_FILTER_ENUM_NONE, &error);
if (!ret) {
Modified: trunk/src/gpk-check-update.c
==============================================================================
--- trunk/src/gpk-check-update.c (original)
+++ trunk/src/gpk-check-update.c Thu Jun 26 12:15:09 2008
@@ -505,7 +505,7 @@
guint i;
guint length;
PkInfoEnum infos = 0;
- PkPackageItem *item;
+ const PkPackageObj *obj;
g_return_val_if_fail (GPK_IS_CHECK_UPDATE (cupdate), PK_INFO_ENUM_UNKNOWN);
@@ -517,13 +517,13 @@
/* add each status to a list */
for (i=0; i<length; i++) {
- item = pk_package_list_get_item (list, i);
- if (item == NULL) {
- pk_warning ("not found item %i", i);
+ obj = pk_package_list_get_obj (list, i);
+ if (obj == NULL) {
+ pk_warning ("not found obj %i", i);
break;
}
- pk_debug ("%s %s", item->package_id, pk_info_enum_to_text (item->info));
- pk_enums_add (infos, item->info);
+ pk_debug ("%s %s", obj->package_id, pk_info_enum_to_text (obj->info));
+ pk_enums_add (infos, obj->info);
}
return infos;
}
@@ -638,7 +638,7 @@
static gboolean
gpk_check_update_query_updates (GpkCheckUpdate *cupdate)
{
- PkPackageItem *item;
+ const PkPackageObj *obj;
guint length;
guint i;
gboolean ret = FALSE;
@@ -696,15 +696,15 @@
/* find the security updates */
for (i=0; i<length; i++) {
- item = pk_package_list_get_item (list, i);
- pk_debug ("%s, %s, %s", pk_info_enum_to_text (item->info),
- item->package_id, item->summary);
- ident = pk_package_id_new_from_string (item->package_id);
- if (item->info == PK_INFO_ENUM_SECURITY) {
+ obj = pk_package_list_get_obj (list, i);
+ pk_debug ("%s, %s, %s", pk_info_enum_to_text (obj->info),
+ obj->package_id, obj->summary);
+ ident = pk_package_id_new_from_string (obj->package_id);
+ if (obj->info == PK_INFO_ENUM_SECURITY) {
/* add to array */
- g_ptr_array_add (security_array, g_strdup (item->package_id));
+ g_ptr_array_add (security_array, g_strdup (obj->package_id));
g_string_append_printf (status_security, "<b>%s</b> - %s\n",
- ident->name, item->summary);
+ ident->name, obj->summary);
}
pk_package_id_free (ident);
}
Modified: trunk/src/gpk-client-chooser.c
==============================================================================
--- trunk/src/gpk-client-chooser.c (original)
+++ trunk/src/gpk-client-chooser.c Thu Jun 26 12:15:09 2008
@@ -172,7 +172,7 @@
GladeXML *glade_xml;
GtkWidget *widget;
GtkTreeSelection *selection;
- PkPackageItem *item;
+ const PkPackageObj *obj;
PkPackageId *ident;
GtkTreeIter iter;
PkExtra *extra;
@@ -247,27 +247,27 @@
/* see what we've got already */
len = pk_package_list_get_size (list);
for (i=0; i<len; i++) {
- item = pk_package_list_get_item (list, i);
- pk_debug ("package '%s' got:", item->package_id);
+ obj = pk_package_list_get_obj (list, i);
+ pk_debug ("package '%s' got:", obj->package_id);
/* put formatted text into treeview */
gtk_list_store_append (list_store, &iter);
- text = gpk_package_id_format_twoline (item->package_id, item->summary);
+ text = gpk_package_id_format_twoline (obj->package_id, obj->summary);
/* get the icon */
- ident = pk_package_id_new_from_string (item->package_id);
+ ident = pk_package_id_new_from_string (obj->package_id);
icon_name = pk_extra_get_icon_name (extra, ident->name);
pk_package_id_free (ident);
/* check icon actually exists and is valid in this theme */
ret = gpk_check_icon_valid (icon_name);
if (!ret) {
- icon_name = gpk_info_enum_to_icon_name (item->info);
+ icon_name = gpk_info_enum_to_icon_name (obj->info);
}
gtk_list_store_set (list_store, &iter,
GPK_CHOOSER_COLUMN_TEXT, text,
- GPK_CHOOSER_COLUMN_ID, item->package_id, -1);
+ GPK_CHOOSER_COLUMN_ID, obj->package_id, -1);
gtk_list_store_set (list_store, &iter, GPK_CHOOSER_COLUMN_ICON, icon_name, -1);
g_free (text);
}
Modified: trunk/src/gpk-client-depends.c
==============================================================================
--- trunk/src/gpk-client-depends.c (original)
+++ trunk/src/gpk-client-depends.c Thu Jun 26 12:15:09 2008
@@ -79,7 +79,7 @@
guint length;
guint i;
GString *string;
- PkPackageItem *item;
+ const PkPackageObj *obj;
gchar *text;
GError *error = NULL;
@@ -137,8 +137,8 @@
goto out;
}
for (i=0; i<length; i++) {
- item = pk_package_list_get_item (list, i);
- text = gpk_package_id_format_oneline (item->package_id, item->summary);
+ obj = pk_package_list_get_obj (list, i);
+ text = gpk_package_id_format_oneline (obj->package_id, obj->summary);
g_string_append_printf (string, "%s\n", text);
g_free (text);
}
Modified: trunk/src/gpk-client-requires.c
==============================================================================
--- trunk/src/gpk-client-requires.c (original)
+++ trunk/src/gpk-client-requires.c Thu Jun 26 12:15:09 2008
@@ -83,7 +83,7 @@
guint length;
guint i;
GString *string;
- PkPackageItem *item;
+ const PkPackageObj *obj;
gchar *text;
gchar *name;
GError *error = NULL;
@@ -129,8 +129,8 @@
goto out;
}
for (i=0; i<length; i++) {
- item = pk_package_list_get_item (list, i);
- text = gpk_package_id_format_oneline (item->package_id, item->summary);
+ obj = pk_package_list_get_obj (list, i);
+ text = gpk_package_id_format_oneline (obj->package_id, obj->summary);
g_string_append_printf (string, "%s\n", text);
g_free (text);
}
Modified: trunk/src/gpk-client-resolve.c
==============================================================================
--- trunk/src/gpk-client-resolve.c (original)
+++ trunk/src/gpk-client-resolve.c Thu Jun 26 12:15:09 2008
@@ -47,7 +47,7 @@
gpk_client_resolve_show (GtkWindow *window, gchar **packages)
{
GError *error = NULL;
- PkPackageItem *item;
+ const PkPackageObj *obj;
PkPackageList *list;
gchar *package_id = NULL;
gchar **package_ids = NULL;
@@ -93,17 +93,17 @@
/* see what we've got already */
for (i=0; i<len; i++) {
- item = pk_package_list_get_item (list, i);
- if (item->info == PK_INFO_ENUM_INSTALLED) {
+ obj = pk_package_list_get_obj (list, i);
+ if (obj->info == PK_INFO_ENUM_INSTALLED) {
already_installed = TRUE;
- } else if (item->info == PK_INFO_ENUM_AVAILABLE) {
- pk_debug ("package '%s' resolved", item->package_id);
+ } else if (obj->info == PK_INFO_ENUM_AVAILABLE) {
+ pk_debug ("package '%s' resolved", obj->package_id);
//TODO: we need to list these in a gpk-client-chooser
if (package_id != NULL) {
pk_warning ("throwing away %s", package_id);
g_free (package_id);
}
- package_id = g_strdup (item->package_id);
+ package_id = g_strdup (obj->package_id);
}
}
Modified: trunk/src/gpk-client.c
==============================================================================
--- trunk/src/gpk-client.c (original)
+++ trunk/src/gpk-client.c Thu Jun 26 12:15:09 2008
@@ -352,7 +352,7 @@
guint length;
PkPackageId *ident;
PkPackageList *list;
- PkPackageItem *item;
+ const PkPackageObj *obj;
GString *message_text;
guint skipped_number = 0;
const gchar *message;
@@ -372,14 +372,14 @@
/* find any we skipped */
for (i=0; i<length; i++) {
- item = pk_package_list_get_item (list, i);
- pk_debug ("%s, %s, %s", pk_info_enum_to_text (item->info),
- item->package_id, item->summary);
- ident = pk_package_id_new_from_string (item->package_id);
- if (item->info == PK_INFO_ENUM_BLOCKED) {
+ obj = pk_package_list_get_obj (list, i);
+ pk_debug ("%s, %s, %s", pk_info_enum_to_text (obj->info),
+ obj->package_id, obj->summary);
+ ident = pk_package_id_new_from_string (obj->package_id);
+ if (obj->info == PK_INFO_ENUM_BLOCKED) {
skipped_number++;
g_string_append_printf (message_text, "<b>%s</b> - %s\n",
- ident->name, item->summary);
+ ident->name, obj->summary);
}
pk_package_id_free (ident);
}
@@ -1333,7 +1333,7 @@
gboolean already_installed = FALSE;
gchar *package_id = NULL;
PkPackageList *list = NULL;
- PkPackageItem *item;
+ const PkPackageObj *obj;
PkPackageId *ident;
gchar **package_ids = NULL;
gchar *text;
@@ -1363,15 +1363,15 @@
/* see what we've got already */
for (i=0; i<len; i++) {
- item = pk_package_list_get_item (list, i);
- if (item->info == PK_INFO_ENUM_INSTALLED) {
+ obj = pk_package_list_get_obj (list, i);
+ if (obj->info == PK_INFO_ENUM_INSTALLED) {
already_installed = TRUE;
g_free (package_id);
- package_id = g_strdup (item->package_id);
+ package_id = g_strdup (obj->package_id);
break;
- } else if (item->info == PK_INFO_ENUM_AVAILABLE) {
- pk_debug ("package '%s' resolved to:", item->package_id);
- package_id = g_strdup (item->package_id);
+ } else if (obj->info == PK_INFO_ENUM_AVAILABLE) {
+ pk_debug ("package '%s' resolved to:", obj->package_id);
+ package_id = g_strdup (obj->package_id);
}
}
@@ -1579,7 +1579,7 @@
gchar *message;
const gchar *title;
gboolean ret;
- PkPackageItem *item;
+ const PkPackageObj *obj;
PkPackageList *list;
GPtrArray *array;
PkCatalog *catalog;
@@ -1653,8 +1653,8 @@
string = g_string_new (_("The following packages are marked to be installed from the catalog:"));
g_string_append (string, "\n\n");
for (i=0; i<len; i++) {
- item = pk_package_list_get_item (list, i);
- text = gpk_package_id_format_oneline (item->package_id, item->summary);
+ obj = pk_package_list_get_obj (list, i);
+ text = gpk_package_id_format_oneline (obj->package_id, obj->summary);
g_string_append_printf (string, "%s\n", text);
g_free (text);
}
@@ -1696,8 +1696,8 @@
/* convert to list of package id's */
array = g_ptr_array_new ();
for (i=0; i<len; i++) {
- item = pk_package_list_get_item (list, i);
- g_ptr_array_add (array, g_strdup (item->package_id));
+ obj = pk_package_list_get_obj (list, i);
+ g_ptr_array_add (array, g_strdup (obj->package_id));
}
/* install packages */
Modified: trunk/src/gpk-interface.h
==============================================================================
--- trunk/src/gpk-interface.h (original)
+++ trunk/src/gpk-interface.h Thu Jun 26 12:15:09 2008
@@ -53,7 +53,7 @@
#endif /* !G_ENABLE_DEBUG */
-/* NONE:STRING,POINTER (/tmp/dbus-binding-tool-c-marshallers.VI70CU:1) */
+/* NONE:STRING,POINTER (/tmp/dbus-binding-tool-c-marshallers.54JLDU:1) */
extern void dbus_glib_marshal_gpk_dbus_VOID__STRING_POINTER (GClosure *closure,
GValue *return_value,
guint n_param_values,
Modified: trunk/src/gpk-update-viewer.c
==============================================================================
--- trunk/src/gpk-update-viewer.c (original)
+++ trunk/src/gpk-update-viewer.c Thu Jun 26 12:15:09 2008
@@ -44,7 +44,7 @@
#include <pk-task-list.h>
#include <pk-package-id.h>
#include <pk-package-ids.h>
-#include <pk-update-detail.h>
+#include <pk-update-detail-obj.h>
#include <gpk-common.h>
#include <gpk-gnome.h>
@@ -390,24 +390,6 @@
}
/**
- * gpk_update_viewer_history_cb:
- **/
-static void
-gpk_update_viewer_history_cb (GtkWidget *widget_button, gpointer data)
-{
- GError *error = NULL;
- GtkWidget *widget;
-
- /* FIXME: do this in process */
- if (!g_spawn_command_line_async ("gpk-log", &error)) {
- widget = glade_xml_get_widget (glade_xml, "window_updates");
- gpk_error_dialog_modal (GTK_WINDOW (widget), _("Failed to launch"),
- _("The file was not found"), error->message);
- g_error_free (error);
- }
-}
-
-/**
* gpk_update_viewer_button_close_and_cancel_cb:
**/
static void
@@ -470,8 +452,7 @@
widget = glade_xml_get_widget (glade_xml, "button_close3");
gtk_widget_grab_default (widget);
} else {
-
- PkPackageItem *item;
+ const PkPackageObj *obj;
guint i;
guint num_low = 0;
guint num_normal = 0;
@@ -483,16 +464,16 @@
gchar *text;
for (i=0;i<length;i++) {
- item = pk_package_list_get_item (list, i);
- if (item->info == PK_INFO_ENUM_LOW) {
+ obj = pk_package_list_get_obj (list, i);
+ if (obj->info == PK_INFO_ENUM_LOW) {
num_low++;
- } else if (item->info == PK_INFO_ENUM_IMPORTANT) {
+ } else if (obj->info == PK_INFO_ENUM_IMPORTANT) {
num_important++;
- } else if (item->info == PK_INFO_ENUM_SECURITY) {
+ } else if (obj->info == PK_INFO_ENUM_SECURITY) {
num_security++;
- } else if (item->info == PK_INFO_ENUM_BUGFIX) {
+ } else if (obj->info == PK_INFO_ENUM_BUGFIX) {
num_bugfix++;
- } else if (item->info == PK_INFO_ENUM_ENHANCEMENT) {
+ } else if (obj->info == PK_INFO_ENUM_ENHANCEMENT) {
num_enhancement++;
} else {
num_normal++;
@@ -556,7 +537,7 @@
{
GError *error = NULL;
PkPackageList *list;
- PkPackageItem *item;
+ const PkPackageObj *obj;
GtkWidget *widget;
guint length;
guint i;
@@ -590,15 +571,15 @@
}
for (i=0; i<length; i++) {
- item = pk_package_list_get_item (list, i);
- text = gpk_package_id_format_twoline (item->package_id, item->summary);
- icon_name = gpk_info_enum_to_icon_name (item->info);
+ obj = pk_package_list_get_obj (list, i);
+ text = gpk_package_id_format_twoline (obj->package_id, obj->summary);
+ icon_name = gpk_info_enum_to_icon_name (obj->info);
gtk_list_store_append (list_store_details, &iter);
gtk_list_store_set (list_store_details, &iter,
PACKAGES_COLUMN_TEXT, text,
- PACKAGES_COLUMN_ID, item->package_id,
+ PACKAGES_COLUMN_ID, obj->package_id,
PACKAGES_COLUMN_ICON, icon_name,
- PACKAGES_COLUMN_INFO, item->info,
+ PACKAGES_COLUMN_INFO, obj->info,
PACKAGES_COLUMN_SELECT, TRUE,
-1);
g_free (text);
@@ -774,7 +755,7 @@
* gpk_update_viewer_update_detail_cb:
**/
static void
-gpk_update_viewer_update_detail_cb (PkClient *client, const PkUpdateDetail *detail, gpointer data)
+gpk_update_viewer_update_detail_cb (PkClient *client, const PkUpdateDetailObj *detail, gpointer data)
{
GtkWidget *widget;
PkPackageId *ident;
@@ -1102,10 +1083,10 @@
}
/**
- * pk_update_update_last_refreshed_time:
+ * pk_update_viewer_set_last_refreshed_time:
**/
static gboolean
-pk_update_update_last_refreshed_time (void)
+pk_update_viewer_set_last_refreshed_time (void)
{
GtkWidget *widget;
guint time;
@@ -1113,17 +1094,28 @@
/* get times from the daemon */
pk_control_get_time_since_action (control, PK_ROLE_ENUM_REFRESH_CACHE, &time, NULL);
+ if (time < 60*60*24) {
+ widget = glade_xml_get_widget (glade_xml, "label_last_refresh_title");
+ gtk_widget_hide (widget);
+ widget = glade_xml_get_widget (glade_xml, "label_last_refresh");
+ gtk_widget_hide (widget);
+ return FALSE;
+ }
+
+ widget = glade_xml_get_widget (glade_xml, "label_last_refresh_title");
+ gtk_widget_show (widget);
time_text = pk_update_get_approx_time (time);
widget = glade_xml_get_widget (glade_xml, "label_last_refresh");
gtk_label_set_label (GTK_LABEL (widget), time_text);
+ gtk_widget_show (widget);
return TRUE;
}
/**
- * pk_update_update_last_updated_time:
+ * pk_update_viewer_set_last_updated_time:
**/
static gboolean
-pk_update_update_last_updated_time (void)
+pk_update_viewer_set_last_updated_time (void)
{
GtkWidget *widget;
guint time;
@@ -1160,7 +1152,7 @@
{
guint i;
guint length;
- PkPackageItem *item;
+ const PkPackageObj *obj;
GString *string;
gboolean exists = FALSE;
gchar *text;
@@ -1172,9 +1164,9 @@
/* find any that are blocked */
length = pk_package_list_get_size (list);
for (i=0;i<length;i++) {
- item = pk_package_list_get_item (list, i);
- if (item->info == PK_INFO_ENUM_BLOCKED) {
- text = gpk_package_id_format_oneline (item->package_id, item->summary);
+ obj = pk_package_list_get_obj (list, i);
+ if (obj->info == PK_INFO_ENUM_BLOCKED) {
+ text = gpk_package_id_format_oneline (obj->package_id, obj->summary);
g_string_append_printf (string, "%s\n", text);
g_free (text);
exists = TRUE;
@@ -1554,10 +1546,10 @@
/* update last time in the UI */
if (role == PK_ROLE_ENUM_REFRESH_CACHE) {
- pk_update_update_last_refreshed_time ();
+ pk_update_viewer_set_last_refreshed_time ();
} else if (role == PK_ROLE_ENUM_UPDATE_SYSTEM ||
role == PK_ROLE_ENUM_UPDATE_PACKAGES) {
- pk_update_update_last_updated_time ();
+ pk_update_viewer_set_last_updated_time ();
}
/* do we need to repopulate the preview widget */
@@ -1687,7 +1679,6 @@
GtkTreeSelection *selection;
PkRoleEnum roles;
gboolean ret;
- GtkSizeGroup *size_group;
GError *error = NULL;
LibUnique *libunique;
@@ -1847,17 +1838,6 @@
g_signal_connect (widget, "clicked",
G_CALLBACK (pk_button_help_cb), "update-viewer-details");
- widget = glade_xml_get_widget (glade_xml, "button_history");
- g_signal_connect (widget, "clicked",
- G_CALLBACK (gpk_update_viewer_history_cb), NULL);
-
- /* make the refresh button the same size as the history one */
- size_group = gtk_size_group_new (GTK_SIZE_GROUP_BOTH);
- widget = glade_xml_get_widget (glade_xml, "button_refresh");
- gtk_size_group_add_widget (size_group, widget);
- widget = glade_xml_get_widget (glade_xml, "button_history");
- gtk_size_group_add_widget (size_group, widget);
-
/* create list stores */
list_store_details = gtk_list_store_new (PACKAGES_COLUMN_LAST, G_TYPE_STRING,
G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT, G_TYPE_BOOLEAN);
@@ -1907,8 +1887,8 @@
gtk_widget_set_sensitive (widget, FALSE);
/* set the last updated text */
- pk_update_update_last_refreshed_time ();
- pk_update_update_last_updated_time ();
+ pk_update_viewer_set_last_refreshed_time ();
+ pk_update_viewer_set_last_updated_time ();
/* we need to grey out all the buttons if we are in progress */
g_signal_connect (tlist, "changed",
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
