Группа :: Сети/Передача файлов
Пакет: uget
Главная Изменения Спек Патчи Sources Загрузить Gear Bugs and FR Repocop
Патч: uget-gtk2.16.patch
Скачать
Скачать
diff --git a/uget/configure.ac b/uget/configure.ac
index b8ef521..2b296f7 100644
--- a/uget/configure.ac
+++ b/uget/configure.ac
@@ -39,7 +39,7 @@ AM_GLIB_DEFINE_LOCALEDIR(LOCALEDIR)
## ----------------------------------------------
## checks for requirements.
-PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.18)
+PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.16)
PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.22)
PKG_CHECK_MODULES(GTHREAD, gthread-2.0)
PKG_CHECK_MODULES(GMODULE, gmodule-2.0)
diff --git a/uget/uget-gtk/ug_category_form.c b/uget/uget-gtk/ug_category_form.c
index 738dc79..8fc016c 100644
--- a/uget/uget-gtk/ug_category_form.c
+++ b/uget/uget-gtk/ug_category_form.c
@@ -97,7 +97,7 @@ void ug_category_form_get (UgCategoryForm* cform, UgCategoryGtk* category)
{
// category = category->queuing; // ug_category_dialog_get() has do this
- if (gtk_widget_is_sensitive (cform->name_entry) == TRUE)
+ if (GTK_WIDGET_IS_SENSITIVE (cform->name_entry) == TRUE)
ug_str_set (&category->name, gtk_entry_get_text ((GtkEntry*) cform->name_entry), -1);
category->limit.active = gtk_spin_button_get_value_as_int ((GtkSpinButton*) cform->spin_active);
// Finished
@@ -110,7 +110,7 @@ void ug_category_form_set (UgCategoryForm* cform, UgCategoryGtk* category)
{
// category = category->queuing; // ug_category_dialog_get() has do this
- if (gtk_widget_is_sensitive (cform->name_entry) == TRUE)
+ if (GTK_WIDGET_IS_SENSITIVE (cform->name_entry) == TRUE)
gtk_entry_set_text ((GtkEntry*) cform->name_entry, (category->name) ? category->name : "");
gtk_spin_button_set_value ((GtkSpinButton*) cform->spin_active, (gdouble) category->limit.active);
// Finished
diff --git a/uget/uget-gtk/ug_download_dialog.c b/uget/uget-gtk/ug_download_dialog.c
index c4090d6..a45bc9d 100644
--- a/uget/uget-gtk/ug_download_dialog.c
+++ b/uget/uget-gtk/ug_download_dialog.c
@@ -362,7 +362,7 @@ static void on_dialog_show (GtkWidget *widget, UgDownloadDialog* ddialog)
gtk_window_set_focus ((GtkWindow*) ddialog->self,
(GtkWidget*) ddialog->selector.notebook);
}
- else if (gtk_widget_is_sensitive (ddialog->download.url_entry)) {
+ else if (GTK_WIDGET_IS_SENSITIVE (ddialog->download.url_entry)) {
gtk_window_set_focus ((GtkWindow*) ddialog->self,
(GtkWidget*) ddialog->download.url_entry);
}
diff --git a/uget/uget-gtk/ug_download_form.c b/uget/uget-gtk/ug_download_form.c
index dcdba9c..b3cc8d2 100644
--- a/uget/uget-gtk/ug_download_form.c
+++ b/uget/uget-gtk/ug_download_form.c
@@ -310,7 +310,7 @@ void ug_download_form_get (UgDownloadForm* dform, UgDataset* dataset)
ug_str_set (&common->password, gtk_entry_get_text ((GtkEntry*)dform->password_entry), -1);
common->retry_limit = gtk_spin_button_get_value_as_int ((GtkSpinButton*) dform->spin_retry);
common->retry_delay = gtk_spin_button_get_value_as_int ((GtkSpinButton*) dform->spin_delay);
- if (gtk_widget_is_sensitive (dform->url_entry) == TRUE) {
+ if (GTK_WIDGET_IS_SENSITIVE (dform->url_entry) == TRUE) {
ug_str_set (&common->url, gtk_entry_get_text ((GtkEntry*)dform->url_entry), -1);
ug_str_set (&common->file, gtk_entry_get_text ((GtkEntry*)dform->file_entry), -1);
if (common->url) {
@@ -353,7 +353,7 @@ void ug_download_form_get (UgDownloadForm* dform, UgDataset* dataset)
}
// UgRelation
- if (gtk_widget_get_sensitive (dform->radio_pause)) {
+ if (GTK_WIDGET_SENSITIVE (dform->radio_pause)) {
relation = ug_dataset_realloc (dataset, UgRelationGtkClass, 0);
if (gtk_toggle_button_get_active ((GtkToggleButton*) dform->radio_pause))
relation->hints |= UG_HINT_PAUSED;
@@ -386,13 +386,13 @@ void ug_download_form_set (UgDownloadForm* dform, UgDataset* dataset, gboolean k
}
// set data
if (keep_changed==FALSE || dform->changed.url==FALSE) {
- if (gtk_widget_is_sensitive (dform->url_entry)) {
+ if (GTK_WIDGET_IS_SENSITIVE (dform->url_entry)) {
gtk_entry_set_text ((GtkEntry*) dform->url_entry,
(common && common->url) ? common->url : "");
}
}
if (keep_changed==FALSE || dform->changed.file==FALSE) {
- if (gtk_widget_is_sensitive (dform->file_entry)) {
+ if (GTK_WIDGET_IS_SENSITIVE (dform->file_entry)) {
gtk_entry_set_text ((GtkEntry*) dform->file_entry,
(common && common->file) ? common->file : "");
// set changed flags
@@ -443,7 +443,7 @@ void ug_download_form_set (UgDownloadForm* dform, UgDataset* dataset, gboolean k
}
// UgRelation
- if (gtk_widget_get_sensitive (dform->radio_pause)) {
+ if (GTK_WIDGET_SENSITIVE (dform->radio_pause)) {
relation = ug_dataset_realloc (dataset, UgRelationGtkClass, 0);
if (relation->hints & UG_HINT_PAUSED)
gtk_toggle_button_set_active ((GtkToggleButton*) dform->radio_pause, TRUE);
@@ -571,7 +571,7 @@ void ug_download_form_complete_entry (UgDownloadForm* dform)
// status
completed = TRUE;
}
- else if (gtk_widget_is_sensitive (dform->url_entry) == FALSE)
+ else if (GTK_WIDGET_IS_SENSITIVE (dform->url_entry) == FALSE)
completed = TRUE;
else
completed = FALSE;
diff --git a/uget/uget-gtk/uget-gtk-callback.c b/uget/uget-gtk/uget-gtk-callback.c
index ccaff24..2e2a44e 100644
--- a/uget/uget-gtk/uget-gtk-callback.c
+++ b/uget/uget-gtk/uget-gtk-callback.c
@@ -236,7 +236,7 @@ static void on_create_download (GtkWidget* widget, UgetGtk* ugtk)
title = g_strconcat (UGET_GTK_NAME " - ", _("New Download"), NULL);
ddialog = ug_download_dialog_new (title, ugtk->window.self);
g_free (title);
- if (gtk_widget_get_visible ((GtkWidget*) ugtk->window.self) == FALSE)
+ if (GTK_WIDGET_VISIBLE ((GtkWidget*) ugtk->window.self) == FALSE)
gtk_window_set_transient_for ((GtkWindow*) ddialog->self, NULL);
ug_download_dialog_set_category (ddialog, &ugtk->category);
ug_download_form_set_folder_list (&ddialog->download,
@@ -290,7 +290,7 @@ static void on_create_from_clipboard (GtkWidget* widget, UgetGtk* ugtk)
title = g_strconcat (UGET_GTK_NAME " - ", _("New from Clipboard"), NULL);
ddialog = ug_download_dialog_new (title, ugtk->window.self);
g_free (title);
- if (gtk_widget_get_visible ((GtkWidget*) ugtk->window.self) == FALSE)
+ if (GTK_WIDGET_VISIBLE ((GtkWidget*) ugtk->window.self) == FALSE)
gtk_window_set_transient_for ((GtkWindow*) ddialog->self, NULL);
ug_download_dialog_set_category (ddialog, &ugtk->category);
ug_download_dialog_use_selector (ddialog);
@@ -1129,7 +1129,7 @@ void on_about (GtkWidget* widget, UgetGtk* ugtk)
//
static void on_tray_icon_activate (GtkStatusIcon* status_icon, UgetGtk* ugtk)
{
- if (gtk_widget_get_visible ((GtkWidget*) ugtk->window.self) == TRUE) {
+ if (GTK_WIDGET_VISIBLE ((GtkWidget*) ugtk->window.self) == TRUE) {
// get position and size
gtk_window_get_position (ugtk->window.self,
&ugtk->setting.window.x, &ugtk->setting.window.y);
diff --git a/uget/uget-gtk/uget-gtk-timeout.c b/uget/uget-gtk/uget-gtk-timeout.c
index 4d1fb4d..153db8c 100644
--- a/uget/uget-gtk/uget-gtk-timeout.c
+++ b/uget/uget-gtk/uget-gtk-timeout.c
@@ -316,7 +316,7 @@ static gboolean uget_gtk_timeout_ipc (UgetGtk* ugtk)
// If no argument, program presents main window to the user.
if (args->len == 1) {
ug_arg_free (args, TRUE);
- if (gtk_widget_get_visible ((GtkWidget*) ugtk->window.self) == FALSE)
+ if (GTK_WIDGET_VISIBLE ((GtkWidget*) ugtk->window.self) == FALSE)
gtk_window_deiconify (ugtk->window.self);
gtk_window_present (ugtk->window.self);
return TRUE;
diff --git a/uget/uget-gtk/uget-gtk.c b/uget/uget-gtk/uget-gtk.c
index 22a4c20..0af509e 100644
--- a/uget/uget-gtk/uget-gtk.c
+++ b/uget/uget-gtk/uget-gtk.c
@@ -280,7 +280,7 @@ void uget_gtk_get_setting (UgetGtk* ugtk, UgetGtkSetting* setting)
GdkWindowState gdk_wstate;
// get window position, size, and maximzied state
- if (gtk_widget_get_visible (GTK_WIDGET (ugtk->window.self)) == TRUE) {
+ if (GTK_WIDGET_VISIBLE (GTK_WIDGET (ugtk->window.self)) == TRUE) {
gdk_wstate = gdk_window_get_state (GTK_WIDGET (ugtk->window.self)->window);
if (gdk_wstate & GDK_WINDOW_STATE_MAXIMIZED)
setting->window.maximized = TRUE;
diff --git a/uget/uget-gtk/uget-gtk.h b/uget/uget-gtk/uget-gtk.h
index 3ea3d23..383f9ee 100644
--- a/uget/uget-gtk/uget-gtk.h
+++ b/uget/uget-gtk/uget-gtk.h
@@ -44,6 +44,10 @@
#include <ug_category-gtk.h>
#include <ug_category_widget.h>
+#ifndef gtk_widget_set_visible /* gtk <=2.16 compatibility */
+#define gtk_widget_set_visible(widget, visible) { if (visible) gtk_widget_show(widget); else gtk_widget_hide(widget); }
+#endif
+
#ifdef __cplusplus
extern "C" {
#endif