IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix compilation errors on FC3.

Browse Source 
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@14594 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
David Hampton 2006-08-05 21:48:54 +00:00
parent de12947c4e
commit e1a44e071c
6 changed files with 41 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2006-08-05 David Hampton <hampton@employees.org>
* src/core-utils/gnc-gtk-utils.[ch]:
* src/core-utils/gnc-gtk-utils.h:
* src/import-export/import-main-matcher.c:
* src/report/report-gnome/dialog-style-sheet.c:
* src/gnome-utils/gnc-main-window.c: Fix compilation errors on
FC3.
2006-08-05 Andreas Köhler <andi5.py@gmx.net>
* various: Unref all new stores.

19
src/core-utils/gnc-gtk-utils.c
View File

@ -29,6 +29,25 @@
#define CHANGED_ID "changed_id"
#ifndef HAVE_GTK26
/* Backwards compatability support for function introduced in gtk
* 2.6. */
gchar *
gtk_combo_box_get_active_text (GtkComboBox *combo_box)
{
GtkTreeModel *model;
GtkTreeIter iter;
gchar *text;
if (!gtk_combo_box_get_active_iter(combo_box, &iter))
return NULL;
model = gtk_combo_box_get_model(combo_box);
gtk_tree_model_get(model, &iter, 0, &text, -1);
return text;
}
#endif
/** Find an entry in the GtkComboBoxEntry by its text value, and set
* the widget to that value. This function also records the index of
* that text value for use when the user leaves the widget.

11
src/core-utils/gnc-gtk-utils.h
View File

@ -39,6 +39,16 @@
#include <gtk/gtk.h>
/** @name gtk Backwards Compatability Functions
@{
*/
#ifndef HVE_GTK26
gchar *gtk_combo_box_get_active_text (GtkComboBox *combo_box);
#endif
/** @} */
/** @name gtk Miscellaneous Functions
@{
*/
@ -47,7 +57,6 @@ void gnc_cbe_set_by_string(GtkComboBoxEntry *cbe, const gchar *text);
void gnc_cbe_add_completion (GtkComboBoxEntry *cbe);
void gnc_cbe_require_list_item (GtkComboBoxEntry *cbe);
/** @} */
#endif /* GNC_GTK_UTILS_H */

4
src/gnome-utils/gnc-main-window.c
View File

@ -581,8 +581,8 @@ gnc_main_window_restore_window (GncMainWindow *window, GncMainWindowSaveData *da
(pos[0] > gdk_screen_width()) ||
(pos[1] + (geom ? geom[1] : 0) < 0) ||
(pos[1] > gdk_screen_height())) {
g_debug("position %dx%d, size%dx%d is offscreen; will not move",
pos[0], pos[1], geom[0], geom[1]);
// g_debug("position %dx%d, size%dx%d is offscreen; will not move",
// pos[0], pos[1], geom[0], geom[1]);
} else {
gtk_window_move(GTK_WINDOW(window), pos[0], pos[1]);
DEBUG("window (%p) position %dx%d", window, pos[0], pos[1]);

1
src/import-export/import-main-matcher.c
View File

@ -135,7 +135,6 @@ on_matcher_ok_clicked (GtkButton *button,
anyway? */
for (item = refs_list; item; item = g_slist_next(item)) {
ref = item->data;
model = gtk_tree_row_reference_get_model(ref);
path = gtk_tree_row_reference_get_path(ref);
if (gtk_tree_model_get_iter(model, &iter, path))
gtk_list_store_remove(GTK_LIST_STORE(model), &iter);

1
src/report/report-gnome/dialog-style-sheet.c
View File

@ -30,6 +30,7 @@
#include "dialog-style-sheet.h"
#include "dialog-options.h"
#include "dialog-utils.h"
#include "gnc-gtk-utils.h"
#include "gnc-report.h"
#include "gnc-ui.h"