summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Woodward2012-08-26 02:28:41 +0000
committerJason Woodward2012-08-26 02:28:41 +0000
commit3ce8cc900936a9133ed9508c12abd655f35d2f48 (patch)
treea0172f8ecc533d332e6adf990720870a84e8dec9
parenta2741582f0d62c124c56a09c934fcd787d61e207 (diff)
downloadgslapt-3ce8cc900936a9133ed9508c12abd655f35d2f48.tar.gz
gdk_pixbuf_unref is deprecated, use g_object_unref
-rw-r--r--src/callbacks.c30
-rw-r--r--src/interface.c26
2 files changed, 28 insertions, 28 deletions
diff --git a/src/callbacks.c b/src/callbacks.c
index 0b55d06..993e61f 100644
--- a/src/callbacks.c
+++ b/src/callbacks.c
@@ -626,7 +626,7 @@ void build_package_treeviewlist (GtkWidget *treeview)
-1
);
- gdk_pixbuf_unref(status_icon);
+ g_object_unref(status_icon);
g_free(status);
g_free(short_desc);
g_free(series);
@@ -672,7 +672,7 @@ void build_package_treeviewlist (GtkWidget *treeview)
-1
);
- gdk_pixbuf_unref(status_icon);
+ g_object_unref(status_icon);
g_free(status);
g_free(short_desc);
}
@@ -1686,8 +1686,8 @@ static void build_sources_treeviewlist(GtkWidget *treeview)
}
- gdk_pixbuf_unref(enabled_status_icon);
- gdk_pixbuf_unref(disabled_status_icon);
+ g_object_unref(enabled_status_icon);
+ g_object_unref(disabled_status_icon);
/* column for enabled status */
renderer = gtk_cell_renderer_pixbuf_new();
@@ -2683,12 +2683,12 @@ void unmark_package(GtkWidget *gslapt, gpointer user_data)
GdkPixbuf *status_icon = create_pixbuf("pkg_action_installed.png");
gtk_list_store_set(GTK_LIST_STORE(model),&actual_iter,STATUS_ICON_COLUMN,status_icon,-1);
status = g_strdup_printf("a%s",pkg->name);
- gdk_pixbuf_unref(status_icon);
+ g_object_unref(status_icon);
} else {
GdkPixbuf *status_icon = create_pixbuf("pkg_action_available.png");
gtk_list_store_set(GTK_LIST_STORE(model),&actual_iter,STATUS_ICON_COLUMN,status_icon,-1);
status = g_strdup_printf("z%s",pkg->name);
- gdk_pixbuf_unref(status_icon);
+ g_object_unref(status_icon);
}
gtk_list_store_set(GTK_LIST_STORE(model),&actual_iter,STATUS_COLUMN,status,-1);
g_free(status);
@@ -2711,7 +2711,7 @@ void unmark_package(GtkWidget *gslapt, gpointer user_data)
gtk_list_store_set(GTK_LIST_STORE(model),&actual_iter,STATUS_COLUMN,istatus,-1);
gtk_list_store_set(GTK_LIST_STORE(model),&actual_iter,MARKED_COLUMN,FALSE,-1);
g_free(istatus);
- gdk_pixbuf_unref(status_icon);
+ g_object_unref(status_icon);
} else {
fprintf(stderr,"failed to find iter for installed package %s-%s to unmark\n",trans->upgrade_pkgs->pkgs[i]->installed->name,trans->upgrade_pkgs->pkgs[i]->installed->version);
}
@@ -3286,14 +3286,14 @@ static gboolean toggle_source_status (GtkTreeView *treeview, gpointer data)
0,status_icon,
2,FALSE,
-1);
- gdk_pixbuf_unref(status_icon);
+ g_object_unref(status_icon);
} else { /* is not active */
GdkPixbuf *status_icon = create_pixbuf("pkg_action_installed.png");
gtk_list_store_set(GTK_LIST_STORE(model),&iter,
0,status_icon,
2,TRUE,
-1);
- gdk_pixbuf_unref(status_icon);
+ g_object_unref(status_icon);
}
sources_modified = TRUE;
@@ -3555,7 +3555,7 @@ static int set_iter_for_install(GtkTreeModel *model, GtkTreeIter *iter,
gtk_list_store_set(GTK_LIST_STORE(model),iter,STATUS_COLUMN,status,-1);
gtk_list_store_set(GTK_LIST_STORE(model),iter,MARKED_COLUMN,TRUE,-1);
g_free(status);
- gdk_pixbuf_unref(status_icon);
+ g_object_unref(status_icon);
}
static int set_iter_for_reinstall(GtkTreeModel *model, GtkTreeIter *iter,
@@ -3567,7 +3567,7 @@ static int set_iter_for_reinstall(GtkTreeModel *model, GtkTreeIter *iter,
gtk_list_store_set(GTK_LIST_STORE(model),iter,STATUS_COLUMN,status,-1);
gtk_list_store_set(GTK_LIST_STORE(model),iter,MARKED_COLUMN,TRUE,-1);
g_free(status);
- gdk_pixbuf_unref(status_icon);
+ g_object_unref(status_icon);
}
static int set_iter_for_downgrade(GtkTreeModel *model, GtkTreeIter *iter,
@@ -3579,7 +3579,7 @@ static int set_iter_for_downgrade(GtkTreeModel *model, GtkTreeIter *iter,
gtk_list_store_set(GTK_LIST_STORE(model),iter,STATUS_COLUMN,status,-1);
gtk_list_store_set(GTK_LIST_STORE(model),iter,MARKED_COLUMN,TRUE,-1);
g_free(status);
- gdk_pixbuf_unref(status_icon);
+ g_object_unref(status_icon);
}
static int set_iter_for_upgrade(GtkTreeModel *model, GtkTreeIter *iter,
@@ -3591,7 +3591,7 @@ static int set_iter_for_upgrade(GtkTreeModel *model, GtkTreeIter *iter,
gtk_list_store_set(GTK_LIST_STORE(model),iter,STATUS_COLUMN,status,-1);
gtk_list_store_set(GTK_LIST_STORE(model),iter,MARKED_COLUMN,TRUE,-1);
g_free(status);
- gdk_pixbuf_unref(status_icon);
+ g_object_unref(status_icon);
}
static int set_iter_for_remove(GtkTreeModel *model, GtkTreeIter *iter,
@@ -3603,7 +3603,7 @@ static int set_iter_for_remove(GtkTreeModel *model, GtkTreeIter *iter,
gtk_list_store_set(GTK_LIST_STORE(model),iter,STATUS_COLUMN,status,-1);
gtk_list_store_set(GTK_LIST_STORE(model),iter,MARKED_COLUMN,TRUE,-1);
g_free(status);
- gdk_pixbuf_unref(status_icon);
+ g_object_unref(status_icon);
}
@@ -3973,7 +3973,7 @@ void source_edit_ok (GtkWidget *w, gpointer user_data)
3, priority_str,
4, priority,
-1);
- gdk_pixbuf_unref(status_icon);
+ g_object_unref(status_icon);
}
sources_modified = TRUE;
diff --git a/src/interface.c b/src/interface.c
index b4c20db..89fc9aa 100644
--- a/src/interface.c
+++ b/src/interface.c
@@ -97,7 +97,7 @@ create_window_preferences (void)
if (window_preferences_icon_pixbuf)
{
gtk_window_set_icon (GTK_WINDOW (window_preferences), window_preferences_icon_pixbuf);
- gdk_pixbuf_unref (window_preferences_icon_pixbuf);
+ g_object_unref (window_preferences_icon_pixbuf);
}
gtk_window_set_gravity (GTK_WINDOW (window_preferences), GDK_GRAVITY_CENTER);
@@ -660,7 +660,7 @@ create_gslapt (void)
if (gslapt_icon_pixbuf)
{
gtk_window_set_icon (GTK_WINDOW (gslapt), gslapt_icon_pixbuf);
- gdk_pixbuf_unref (gslapt_icon_pixbuf);
+ g_object_unref (gslapt_icon_pixbuf);
}
gtk_window_set_gravity (GTK_WINDOW (gslapt), GDK_GRAVITY_CENTER);
@@ -1735,7 +1735,7 @@ create_transaction_window (void)
if (transaction_window_icon_pixbuf)
{
gtk_window_set_icon (GTK_WINDOW (transaction_window), transaction_window_icon_pixbuf);
- gdk_pixbuf_unref (transaction_window_icon_pixbuf);
+ g_object_unref (transaction_window_icon_pixbuf);
}
gtk_window_set_gravity (GTK_WINDOW (transaction_window), GDK_GRAVITY_CENTER);
@@ -1913,7 +1913,7 @@ create_dl_progress_window (void)
if (dl_progress_window_icon_pixbuf)
{
gtk_window_set_icon (GTK_WINDOW (dl_progress_window), dl_progress_window_icon_pixbuf);
- gdk_pixbuf_unref (dl_progress_window_icon_pixbuf);
+ g_object_unref (dl_progress_window_icon_pixbuf);
}
gtk_window_set_gravity (GTK_WINDOW (dl_progress_window), GDK_GRAVITY_CENTER);
@@ -2013,7 +2013,7 @@ create_about (void)
if (about_icon_pixbuf)
{
gtk_window_set_icon (GTK_WINDOW (about), about_icon_pixbuf);
- gdk_pixbuf_unref (about_icon_pixbuf);
+ g_object_unref (about_icon_pixbuf);
}
gtk_window_set_type_hint (GTK_WINDOW (about), GDK_WINDOW_TYPE_HINT_DIALOG);
gtk_window_set_gravity (GTK_WINDOW (about), GDK_GRAVITY_CENTER);
@@ -2115,7 +2115,7 @@ create_notification (void)
if (notification_icon_pixbuf)
{
gtk_window_set_icon (GTK_WINDOW (notification), notification_icon_pixbuf);
- gdk_pixbuf_unref (notification_icon_pixbuf);
+ g_object_unref (notification_icon_pixbuf);
}
gtk_window_set_type_hint (GTK_WINDOW (notification), GDK_WINDOW_TYPE_HINT_DIALOG);
gtk_window_set_gravity (GTK_WINDOW (notification), GDK_GRAVITY_CENTER);
@@ -2220,7 +2220,7 @@ create_icon_legend (void)
if (icon_legend_icon_pixbuf)
{
gtk_window_set_icon (GTK_WINDOW (icon_legend), icon_legend_icon_pixbuf);
- gdk_pixbuf_unref (icon_legend_icon_pixbuf);
+ g_object_unref (icon_legend_icon_pixbuf);
}
gtk_window_set_type_hint (GTK_WINDOW (icon_legend), GDK_WINDOW_TYPE_HINT_DIALOG);
gtk_window_set_gravity (GTK_WINDOW (icon_legend), GDK_GRAVITY_CENTER);
@@ -2481,7 +2481,7 @@ create_pkgtools_progress_window (void)
if (pkgtools_progress_window_icon_pixbuf)
{
gtk_window_set_icon (GTK_WINDOW (pkgtools_progress_window), pkgtools_progress_window_icon_pixbuf);
- gdk_pixbuf_unref (pkgtools_progress_window_icon_pixbuf);
+ g_object_unref (pkgtools_progress_window_icon_pixbuf);
}
gtk_window_set_gravity (GTK_WINDOW (pkgtools_progress_window), GDK_GRAVITY_CENTER);
@@ -2551,7 +2551,7 @@ create_repositories_changed (void)
if (repositories_changed_icon_pixbuf)
{
gtk_window_set_icon (GTK_WINDOW (repositories_changed), repositories_changed_icon_pixbuf);
- gdk_pixbuf_unref (repositories_changed_icon_pixbuf);
+ g_object_unref (repositories_changed_icon_pixbuf);
}
gtk_window_set_type_hint (GTK_WINDOW (repositories_changed), GDK_WINDOW_TYPE_HINT_DIALOG);
@@ -2660,7 +2660,7 @@ create_dep_error_dialog (void)
if (dep_error_dialog_icon_pixbuf)
{
gtk_window_set_icon (GTK_WINDOW (dep_error_dialog), dep_error_dialog_icon_pixbuf);
- gdk_pixbuf_unref (dep_error_dialog_icon_pixbuf);
+ g_object_unref (dep_error_dialog_icon_pixbuf);
}
gtk_window_set_type_hint (GTK_WINDOW (dep_error_dialog), GDK_WINDOW_TYPE_HINT_DIALOG);
gtk_window_set_gravity (GTK_WINDOW (dep_error_dialog), GDK_GRAVITY_CENTER);
@@ -2793,7 +2793,7 @@ create_source_failed_dialog (void)
if (source_failed_dialog_icon_pixbuf)
{
gtk_window_set_icon (GTK_WINDOW (source_failed_dialog), source_failed_dialog_icon_pixbuf);
- gdk_pixbuf_unref (source_failed_dialog_icon_pixbuf);
+ g_object_unref (source_failed_dialog_icon_pixbuf);
}
gtk_window_set_type_hint (GTK_WINDOW (source_failed_dialog), GDK_WINDOW_TYPE_HINT_DIALOG);
@@ -2884,7 +2884,7 @@ create_changelog_window (void)
if (changelog_window_icon_pixbuf)
{
gtk_window_set_icon (GTK_WINDOW (changelog_window), changelog_window_icon_pixbuf);
- gdk_pixbuf_unref (changelog_window_icon_pixbuf);
+ g_object_unref (changelog_window_icon_pixbuf);
}
vbox78 = gtk_vbox_new (FALSE, 0);
@@ -2954,7 +2954,7 @@ create_source_window (void)
if (source_window_icon_pixbuf)
{
gtk_window_set_icon (GTK_WINDOW (source_window), source_window_icon_pixbuf);
- gdk_pixbuf_unref (source_window_icon_pixbuf);
+ g_object_unref (source_window_icon_pixbuf);
}
vbox79 = gtk_vbox_new (FALSE, 0);