[mednaffe] 86/99: Fix some warnings from deprecated GTK+ 3 functions
Stephen Kitt
skitt at moszumanska.debian.org
Tue Aug 2 21:00:11 UTC 2016
This is an automated email from the git hooks/post-receive script.
skitt pushed a commit to branch master
in repository mednaffe.
commit 9d08fcc9d6fc2101f5ea699f0a43398f05e509d4
Author: AmatCoder <amatcoder at gmail.com>
Date: Thu Jul 23 20:51:47 2015 +0200
Fix some warnings from deprecated GTK+ 3 functions
---
src/about.c | 6 +--
src/active.c | 67 ++++++++++++++++++++++----------
src/command.c | 10 ++++-
src/common.h | 1 +
src/list.c | 121 ++++++++++++++++++++++++++++++---------------------------
src/mednaffe.c | 22 +++++++----
6 files changed, 135 insertions(+), 92 deletions(-)
diff --git a/src/about.c b/src/about.c
index 96908df..388caea 100644
--- a/src/about.c
+++ b/src/about.c
@@ -43,8 +43,6 @@ You should have received a copy of the GNU General Public License \
along with Mednaffe. If not, see <http://www.gnu.org/licenses/>.";
-GdkPixbuf *pixbuf = gdk_pixbuf_new_from_inline (-1, logo, FALSE, NULL);
-
gtk_show_about_dialog(
GTK_WINDOW(gui->topwindow),
"program-name", "Mednaffe",
@@ -59,8 +57,6 @@ gtk_show_about_dialog(
"license", gpl3,
"wrap-license", TRUE,
"website", "https://github.com/AmatCoder/mednaffe",
- "logo", pixbuf,
+ "logo", gui->pixbuf,
NULL);
-
- g_object_unref(pixbuf);
}
diff --git a/src/active.c b/src/active.c
index 6c14445..167a03e 100644
--- a/src/active.c
+++ b/src/active.c
@@ -27,16 +27,21 @@ G_MODULE_EXPORT
#endif
void on_entry_color_changed(GtkEditable *editable, gpointer colorbutton)
{
- GdkColor color;
+
gchar *text;
gchar *total;
text = gtk_editable_get_chars(editable,2,-1);
total = g_strconcat("#", text, NULL);
-
+#ifdef GTK2_ENABLED
+ GdkColor color;
gdk_color_parse(total, &color);
gtk_color_button_set_color(GTK_COLOR_BUTTON(colorbutton), &color);
-
+#else
+ GdkRGBA color;
+ gdk_rgba_parse (&color, total);
+ gtk_color_chooser_set_rgba(GTK_COLOR_CHOOSER(colorbutton), &color);
+#endif
g_free(text);
g_free(total);
}
@@ -46,23 +51,29 @@ G_MODULE_EXPORT
#endif
void on_cbvbdefault_color_set(GtkColorButton *widget, gpointer entry)
{
- GdkColor color;
gchar *hex;
gchar *total;
+#ifdef GTK2_ENABLED
+ GdkColor color;
gtk_color_button_get_color(widget, &color);
-
hex = gtk_color_selection_palette_to_string(&color, 1);
hex++;
total = g_strconcat("0x", hex, NULL);
- /*total = g_strdup_printf ("0x%2X%2X%2X",
- color->red / 256,
- color->green / 256,
- color->blue / 256);*/
+ hex--;
+#else
+ GdkRGBA color;
+ gtk_color_chooser_get_rgba(GTK_COLOR_CHOOSER(widget), &color);
+ hex = gdk_rgba_to_string(&color);
+ total = g_strdup_printf ("0x%02X%02X%02X",
+ (unsigned int)(color.red * 255),
+ (unsigned int)(color.green * 255),
+ (unsigned int)(color.blue * 255));
+#endif
+
gtk_entry_set_text(entry, total);
- hex--;
g_free(hex);
g_free(total);
@@ -85,16 +96,24 @@ void on_button_entry_clicked_folder(GtkButton *button, GtkEntry *entry)
{
GtkWidget *folder;
+#ifdef GTK2_ENABLED
folder = gtk_file_chooser_dialog_new(
"Choose a folder...", NULL,
GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, GTK_STOCK_CANCEL,
- GTK_RESPONSE_CANCEL, GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
+ GTK_RESPONSE_CANCEL, GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
NULL);
-
+#else
+ folder = gtk_file_chooser_dialog_new(
+ "Choose a folder...", NULL,
+ GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, ("_Cancel"),
+ GTK_RESPONSE_CANCEL, ("_Open"), GTK_RESPONSE_ACCEPT,
+ NULL);
+#endif
+
if (gtk_dialog_run(GTK_DIALOG(folder)) == GTK_RESPONSE_ACCEPT)
{
gchar *path;
-
+
path = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER (folder));
gtk_entry_set_text(entry, path);
g_free(path);
@@ -109,16 +128,22 @@ void on_button_entry_clicked(GtkButton *button, GtkEntry *entry)
{
GtkWidget *folder;
+#ifdef GTK2_ENABLED
folder = gtk_file_chooser_dialog_new(
"Choose a file...", NULL,
GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL,
- GTK_RESPONSE_CANCEL, GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
- NULL);
+ GTK_RESPONSE_CANCEL, GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL);
+#else
+ folder = gtk_file_chooser_dialog_new(
+ "Choose a file...", NULL,
+ GTK_FILE_CHOOSER_ACTION_OPEN, ("_Cancel"),
+ GTK_RESPONSE_CANCEL, ("_Open"), GTK_RESPONSE_ACCEPT, NULL);
+#endif
if (gtk_dialog_run(GTK_DIALOG(folder)) == GTK_RESPONSE_ACCEPT)
{
gchar *path;
-
+
path = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (folder));
gtk_entry_set_text(entry, path);
g_free(path);
@@ -133,7 +158,7 @@ void cbvideodrv_changed_cb(GtkComboBox *combobox, GtkWidget *widget)
{
if (gtk_combo_box_get_active(combobox)==0)
gtk_widget_set_sensitive(widget, TRUE);
- else
+ else
gtk_widget_set_sensitive(widget, FALSE);
}
@@ -151,7 +176,7 @@ void on_tbsound_toggled(GtkToggleButton *sender, GtkWidget *widget)
{
gtk_widget_set_sensitive(
list->data, gtk_toggle_button_get_active(sender));
-
+
list = list->next;
}
g_list_free (list);
@@ -172,7 +197,7 @@ void on_ntsc_changed(GtkComboBox *combobox, GtkWidget *widget)
{
if ((gtk_combo_box_get_active(combobox)==0) || (gtk_combo_box_get_active(combobox)==5))
gtk_widget_set_sensitive(widget, TRUE);
- else
+ else
gtk_widget_set_sensitive(widget, FALSE);
}
@@ -183,6 +208,6 @@ void on_vbmode2_changed(GtkComboBox *combobox, GtkWidget *widget)
{
if (gtk_combo_box_get_active(combobox)!=0)
gtk_widget_set_sensitive(widget, TRUE);
- else
- gtk_widget_set_sensitive(widget, FALSE);
+ else
+ gtk_widget_set_sensitive(widget, FALSE);
}
diff --git a/src/command.c b/src/command.c
index 9c5aa11..93f8b33 100644
--- a/src/command.c
+++ b/src/command.c
@@ -338,11 +338,17 @@ void open_rom(GtkWidget *sender, guidata *gui)
{
GtkWidget *folder;
+#ifdef GTK2_ENABLED
folder = gtk_file_chooser_dialog_new(
- "Choose a ROM...", NULL,
+ "Choose a ROM...", GTK_WINDOW(gui->topwindow),
GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL,
GTK_RESPONSE_CANCEL, GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL );
-
+#else
+ folder = gtk_file_chooser_dialog_new(
+ "Choose a ROM...", GTK_WINDOW(gui->topwindow),
+ GTK_FILE_CHOOSER_ACTION_OPEN, ("_Cancel"),
+ GTK_RESPONSE_CANCEL, ("_Open"), GTK_RESPONSE_ACCEPT, NULL);
+#endif
if (gtk_dialog_run(GTK_DIALOG(folder)) == GTK_RESPONSE_ACCEPT)
{
gchar *filename;
diff --git a/src/common.h b/src/common.h
index 302f99d..7067a8e 100644
--- a/src/common.h
+++ b/src/common.h
@@ -68,6 +68,7 @@ typedef struct
GtkTreeViewColumn *column;
GtkListStore *store;
GtkCellEditable *editable;
+ GdkPixbuf *pixbuf;
gint listmode;
gint filter;
gint pagesys;
diff --git a/src/list.c b/src/list.c
index 5f51425..59ce1d7 100644
--- a/src/list.c
+++ b/src/list.c
@@ -32,9 +32,9 @@ void change_list (guidata *gui)
GtkAdjustment *adjustament;
gchar *buff, *total;
- buff=g_strdup_printf("%i",
+ buff=g_strdup_printf("%i",
gtk_tree_model_iter_n_children(GTK_TREE_MODEL(gui->store), NULL));
-
+
total = g_strconcat(" Games in list: ", buff, NULL);
gtk_statusbar_pop(GTK_STATUSBAR(gui->sbnumber), 1);
gtk_statusbar_pop(GTK_STATUSBAR(gui->sbname), 1);
@@ -47,10 +47,10 @@ void change_list (guidata *gui)
g_free(total);
g_free(buff);
- adjustament =
+ adjustament =
gtk_scrolled_window_get_vadjustment(
GTK_SCROLLED_WINDOW(gui->scrollwindow));
-
+
gtk_adjustment_set_value (adjustament, 0);
gtk_widget_grab_focus(gui->gamelist);
@@ -64,9 +64,9 @@ void remove_folder(GtkWidget *sender, guidata *gui)
GtkTreeIter iter, iter2;
GtkListStore *combostore;
- combostore =
+ combostore =
GTK_LIST_STORE(gtk_combo_box_get_model(GTK_COMBO_BOX(gui->cbpath)));
-
+
if (gtk_combo_box_get_active_iter(GTK_COMBO_BOX(gui->cbpath), &iter))
{
if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(combostore), &iter2))
@@ -76,11 +76,11 @@ void remove_folder(GtkWidget *sender, guidata *gui)
gtk_statusbar_pop(GTK_STATUSBAR(gui->sbnumber), 1);
gtk_statusbar_push(GTK_STATUSBAR(gui->sbnumber), 1,
" Games in list: 0 ");
-
+
gtk_statusbar_pop(GTK_STATUSBAR(gui->sbname), 1);
gtk_statusbar_push(GTK_STATUSBAR(gui->sbname), 1,
" Game selected: None");
-
+
g_free(gui->rompath);
g_free(gui->rom);
gui->rompath=NULL;
@@ -108,15 +108,22 @@ void open_folder(GtkWidget *sender, guidata *gui)
{
GtkWidget *folder;
+#ifdef GTK2_ENABLED
folder = gtk_file_chooser_dialog_new(
- "Choose a ROM folder...", NULL,
+ "Choose a ROM folder...", GTK_WINDOW(gui->topwindow),
GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, GTK_STOCK_CANCEL,
GTK_RESPONSE_CANCEL, GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL );
+#else
+ folder = gtk_file_chooser_dialog_new(
+ "Choose a ROM folder...", GTK_WINDOW(gui->topwindow),
+ GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, ("_Cancel"),
+ GTK_RESPONSE_CANCEL, ("_Open"), GTK_RESPONSE_ACCEPT, NULL);
+#endif
if (gtk_dialog_run(GTK_DIALOG(folder)) == GTK_RESPONSE_ACCEPT)
{
gchar *path;
-
+
path = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (folder));
add_combo(GTK_COMBO_BOX(gui->cbpath), path);
g_free(path);
@@ -125,12 +132,12 @@ void open_folder(GtkWidget *sender, guidata *gui)
}
int descend_sort(const void * a, const void * b)
-{
+{
return strcmp(a, b);
}
int ascend_sort(const void * a, const void * b)
-{
+{
return strcmp(b, a);
}
@@ -148,7 +155,7 @@ void scan_files(gchar *romdir, guidata *gui)
gchar *testdir = g_strconcat(romdir, G_DIR_SEPARATOR_S, FindFileData.cFileName, NULL);
if ((FindFileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY))
{
- if (gui->listmode == 1 && (0 != strcmp(FindFileData.cFileName, ".")
+ if (gui->listmode == 1 && (0 != strcmp(FindFileData.cFileName, ".")
&& 0 != strcmp (FindFileData.cFileName, "..")))
{
scan_files(testdir, gui);
@@ -156,32 +163,32 @@ void scan_files(gchar *romdir, guidata *gui)
}
else
{
- if (gui->filter == 0)
- {
- gui->itemlist = g_slist_prepend(gui->itemlist,
+ if (gui->filter == 0)
+ {
+ gui->itemlist = g_slist_prepend(gui->itemlist,
g_strconcat(FindFileData.cFileName, G_DIR_SEPARATOR_S, testdir, NULL));
- }
- else if ((gui->filter == 1) && (g_str_has_suffix(FindFileData.cFileName, ".zip") ||
+ }
+ else if ((gui->filter == 1) && (g_str_has_suffix(FindFileData.cFileName, ".zip") ||
g_str_has_suffix(FindFileData.cFileName, ".ZIP")))
{
- gui->itemlist = g_slist_prepend(gui->itemlist,
+ gui->itemlist = g_slist_prepend(gui->itemlist,
g_strconcat(FindFileData.cFileName, G_DIR_SEPARATOR_S, testdir, NULL));
}
- else if ((gui->filter == 2) && (g_str_has_suffix(FindFileData.cFileName, ".cue") ||
+ else if ((gui->filter == 2) && (g_str_has_suffix(FindFileData.cFileName, ".cue") ||
g_str_has_suffix(FindFileData.cFileName, ".toc") ||
g_str_has_suffix(FindFileData.cFileName, ".ccd") ||
g_str_has_suffix(FindFileData.cFileName, ".m3u") ||
g_str_has_suffix(FindFileData.cFileName, ".CUE") ||
- g_str_has_suffix(FindFileData.cFileName, ".TOC") ||
+ g_str_has_suffix(FindFileData.cFileName, ".TOC") ||
g_str_has_suffix(FindFileData.cFileName, ".CCD") ||
g_str_has_suffix(FindFileData.cFileName, ".M3U")))
{
- gui->itemlist = g_slist_prepend(gui->itemlist,
+ gui->itemlist = g_slist_prepend(gui->itemlist,
g_strconcat(FindFileData.cFileName, G_DIR_SEPARATOR_S, testdir, NULL));
- }
+ }
}
g_free(testdir);
-
+
if (!FindNextFile(hFind, &FindFileData))
{
FindClose(hFind);
@@ -196,46 +203,46 @@ void scan_files(gchar *romdir, guidata *gui)
void scan_files(gchar *romdir, guidata *gui)
{
GDir *dir = NULL;
-
+
dir = g_dir_open(romdir, 0, NULL);
if (dir != NULL)
{
const gchar *file = NULL;
-
+
while ((file=g_dir_read_name(dir)) != NULL)
{
gchar *testdir = g_strconcat(romdir, G_DIR_SEPARATOR_S, file, NULL);
-
+
if (!g_file_test (testdir, G_FILE_TEST_IS_DIR))
- {
+ {
if (gui->filter == 0)
- {
- gui->itemlist = g_slist_prepend(gui->itemlist,
- g_strconcat(file, G_DIR_SEPARATOR_S, testdir, NULL));
+ {
+ gui->itemlist = g_slist_prepend(gui->itemlist,
+ g_strconcat(file, G_DIR_SEPARATOR_S, testdir, NULL));
}
- else if ((gui->filter == 1) && (g_str_has_suffix(file, ".zip") ||
+ else if ((gui->filter == 1) && (g_str_has_suffix(file, ".zip") ||
g_str_has_suffix(file, ".ZIP")))
{
- gui->itemlist = g_slist_prepend(gui->itemlist,
+ gui->itemlist = g_slist_prepend(gui->itemlist,
g_strconcat(file, G_DIR_SEPARATOR_S, testdir, NULL));
}
- else if ((gui->filter == 2) && (g_str_has_suffix(file, ".cue") ||
+ else if ((gui->filter == 2) && (g_str_has_suffix(file, ".cue") ||
g_str_has_suffix(file, ".toc") ||
g_str_has_suffix(file, ".ccd") ||
g_str_has_suffix(file, ".m3u") ||
g_str_has_suffix(file, ".CUE") ||
- g_str_has_suffix(file, ".TOC") ||
+ g_str_has_suffix(file, ".TOC") ||
g_str_has_suffix(file, ".CCD") ||
g_str_has_suffix(file, ".M3U")))
{
- gui->itemlist = g_slist_prepend(gui->itemlist,
+ gui->itemlist = g_slist_prepend(gui->itemlist,
g_strconcat(file, G_DIR_SEPARATOR_S, testdir, NULL));
- }
+ }
}
else
{
- if (gui->listmode == 1)
+ if (gui->listmode == 1)
scan_files(testdir, gui);
}
g_free(testdir);
@@ -259,14 +266,14 @@ void populate_list(guidata *gui)
GtkTreeIter iter;
GSList *iterator = NULL;
gint i = 0;
-
+
for (iterator = gui->itemlist; iterator; iterator = iterator->next)
{
gchar **str;
-
- str = g_strsplit (iterator->data, G_DIR_SEPARATOR_S, 2);
-
- gtk_list_store_insert_with_values(gui->store, &iter, -1,
+
+ str = g_strsplit (iterator->data, G_DIR_SEPARATOR_S, 2);
+
+ gtk_list_store_insert_with_values(gui->store, &iter, -1,
0, str[0], 1, str[1], -1);
i++;
g_strfreev(str);
@@ -289,10 +296,10 @@ void fill_list(GtkComboBox *combobox, guidata *gui)
{
GtkTreeModel *model;
GtkTreeIter iter;
-
+
model=gtk_combo_box_get_model(GTK_COMBO_BOX(gui->cbpath));
-
+
if (gtk_combo_box_get_active_iter(GTK_COMBO_BOX(gui->cbpath), &iter))
{
g_free(gui->rompath);
@@ -301,20 +308,20 @@ void fill_list(GtkComboBox *combobox, guidata *gui)
gtk_list_store_clear(gui->store);
if (gui->rompath!=NULL)
scan_dir(gui->rompath, gui);
-
- gtk_tree_view_set_model(GTK_TREE_VIEW(gui->gamelist),
+
+ gtk_tree_view_set_model(GTK_TREE_VIEW(gui->gamelist),
GTK_TREE_MODEL(gui->store));
change_list(gui);
-
+
if (gtk_tree_model_get_iter_first(gtk_tree_view_get_model(
GTK_TREE_VIEW(gui->gamelist)), &iter))
- {
+ {
gtk_tree_selection_select_iter(gtk_tree_view_get_selection(
GTK_TREE_VIEW(gui->gamelist)), &iter);
}
- }
+ }
gtk_tree_view_column_set_sort_indicator(gui->column, TRUE);
-
+
}
@@ -323,18 +330,18 @@ G_MODULE_EXPORT
#endif
void header_clicked(GtkTreeViewColumn *treeviewcolumn, guidata *gui)
{
- if (gtk_tree_view_column_get_sort_order(gui->column) == GTK_SORT_ASCENDING)
+ if (gtk_tree_view_column_get_sort_order(gui->column) == GTK_SORT_ASCENDING)
gtk_tree_view_column_set_sort_order(gui->column, GTK_SORT_DESCENDING);
- else
+ else
gtk_tree_view_column_set_sort_order(gui->column, GTK_SORT_ASCENDING);
-
+
gtk_tree_view_set_model(GTK_TREE_VIEW(gui->gamelist), NULL);
- gtk_list_store_clear(gui->store);
+ gtk_list_store_clear(gui->store);
gui->itemlist = g_slist_reverse(gui->itemlist);
populate_list(gui);
- gtk_tree_view_set_model(GTK_TREE_VIEW(gui->gamelist),
+ gtk_tree_view_set_model(GTK_TREE_VIEW(gui->gamelist),
GTK_TREE_MODEL(gui->store));
-
+
gtk_tree_view_column_set_sort_indicator(gui->column, TRUE);
}
diff --git a/src/mednaffe.c b/src/mednaffe.c
index 499ad8f..16d6842 100644
--- a/src/mednaffe.c
+++ b/src/mednaffe.c
@@ -57,7 +57,7 @@ void show_error(const gchar *message)
printf("%s", message);
}
-gchar* show_chooser(const gchar *message)
+gchar* show_chooser(const gchar *message, guidata *gui)
{
GtkWidget *exe;
gchar *filename = NULL;
@@ -75,10 +75,17 @@ gchar* show_chooser(const gchar *message)
}
gtk_widget_destroy (dialog);
+#ifdef GTK2_ENABLED
exe = gtk_file_chooser_dialog_new(
- "Choose a mednafen executable...", NULL,
+ "Choose a mednafen executable...", GTK_WINDOW(gui->topwindow),
GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL,
GTK_RESPONSE_CANCEL, GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL );
+#else
+ exe = gtk_file_chooser_dialog_new(
+ "Choose a mednafen executable...", GTK_WINDOW(gui->topwindow),
+ GTK_FILE_CHOOSER_ACTION_OPEN, ("_Cancel"),
+ GTK_RESPONSE_CANCEL, ("_Open"), GTK_RESPONSE_ACCEPT, NULL);
+#endif
GtkFileFilter* filter = gtk_file_filter_new();
gtk_file_filter_add_pattern(filter, "mednafen.exe");
@@ -267,6 +274,7 @@ void quit(GtkWidget *widget, guidata *gui)
printf("Exiting Mednaffe...\n");
/* To free items makes happy to Valgrind ;-) */
+ g_object_unref(gui->pixbuf);
g_object_unref(G_OBJECT(gui->builder));
g_object_unref(G_OBJECT(gui->specific));
g_object_unref(G_OBJECT(gui->settings));
@@ -280,8 +288,8 @@ void quit(GtkWidget *widget, guidata *gui)
g_free(gui->fullsystem);
g_free(gui->system);
g_free(gui->cfgfile);
- g_free(gui->port)
- ;g_free(gui->treepath);
+ g_free(gui->port);
+ g_free(gui->treepath);
g_slist_free_full(gui->itemlist, g_free);
gtk_main_quit();
@@ -485,7 +493,7 @@ int main(int argc, char **argv)
{
gui.binpath = show_chooser(
"Warning: Mednafen executable is not installed in path.\nDo you \
-want to select the file manually?\n");
+want to select the file manually?\n", &gui);
if (gui.binpath==NULL)
{
show_error(
@@ -563,8 +571,8 @@ version or above.\n");
select_rows(&gui);
/* Create icon */
- gtk_window_set_icon(GTK_WINDOW(gui.topwindow),
- gdk_pixbuf_new_from_inline (-1, logo, FALSE, NULL));
+ gui.pixbuf = gdk_pixbuf_new_from_inline (-1, logo, FALSE, NULL);
+ gtk_window_set_icon(GTK_WINDOW(gui.topwindow), gui.pixbuf);
/* Show window and set focus */
gtk_widget_show(gui.topwindow);
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mednaffe.git
More information about the Pkg-games-commits
mailing list