Changeset 065aeb81158ce490b30f38125a0093ae55a45366

Timestamp:

04/20/08 22:09:39 (5 years ago)

Author:

Armin Burgmeier <armin@…>

Parents:

4215a907f533b91f3cd05f00f8a8b2066ec6fdf9

Children:

dddf956080b7fa0418b32a1b5b9d4003a4f239cc

git-committer:

Armin Burgmeier <armin@arbur.net> / 2008-04-20T22:09:39Z+0200

Message:

Adapt to new infinote API

2008-04-20 Armin Burgmeier <armin@…>

• inc/browser.hpp:
• src/browser.cpp: Adapt to new infinote API by using InfGtkBrowserStore? instead of InfGtkBrowserModel?.

Files:

• ChangeLog (modified) (1 diff)
• inc/browser.hpp (modified) (3 diffs)
• src/browser.cpp (modified) (7 diffs)

ChangeLog

@@ +1 @@
+2008-04-20  Armin Burgmeier  <armin@0x539.de>
+
+        * inc/browser.hpp:
+        * src/browser.cpp: Adapt to new infinote API by using
+        InfGtkBrowserStore instead of InfGtkBrowserModel.
+
 2008-04-20  Armin Burgmeier  <armin@0x539.de>
 

inc/browser.hpp

@@ -21 +21 @@
 
 #include <libinfgtk/inf-gtk-io.h>
-#include <libinfgtk/inf-gtk-browser-model.h>
+#include <libinfgtk/inf-gtk-browser-store.h>
 #include <libinfgtk/inf-gtk-browser-view.h>
 #include <libinfinity/client/infc-browser.h>
@@ -74 +74 @@
                 browserpp->on_set_browser(iter, browser);
                         //Gtk::TreeIter(
-                        //      GTK_TREE_MODEL(browserpp->m_browser_model),
+                        //      GTK_TREE_MODEL(browserpp->m_browser_store),
                         //      iter), browser);
         }
@@ -102 +102 @@
         InfXmppManager* m_xmpp_manager;
         InfGtkIo* m_io;
-        InfGtkBrowserModel* m_browser_model;
+        InfGtkBrowserStore* m_browser_store;
         InfGtkBrowserView* m_browser_view;
         Gtk::ScrolledWindow m_scroll;

src/browser.cpp

@@ -56 +56 @@
                 inf_connection_manager_new();
 
-        m_browser_model = inf_gtk_browser_model_new(INF_IO(m_io),
+        m_browser_store = inf_gtk_browser_store_new(INF_IO(m_io),
                                                     connection_manager,
                                                     NULL);
@@ -66 +66 @@
                 inf_discovery_avahi_new(INF_IO(m_io), m_xmpp_manager,
                                         NULL, NULL);
-        inf_gtk_browser_model_add_discovery(m_browser_model,
+        inf_gtk_browser_store_add_discovery(m_browser_store,
                                             INF_DISCOVERY(discovery));
         g_object_unref(discovery);
@@ -73 +73 @@
         m_browser_view =
                 INF_GTK_BROWSER_VIEW(
-                        inf_gtk_browser_view_new_with_model(m_browser_model));
+                        inf_gtk_browser_view_new_with_model(
+                                INF_GTK_BROWSER_MODEL(m_browser_store)));
 
         gtk_widget_show(GTK_WIDGET(m_browser_view));
@@ -83 +84 @@
 
         g_signal_connect(
-                m_browser_model,
+                m_browser_store,
                 "set-browser",
                 G_CALLBACK(&on_set_browser_static),
@@ -111 +112 @@
         }
 
-        g_object_unref(m_browser_model);
+        g_object_unref(m_browser_store);
         g_object_unref(m_io);
 }
@@ -144 +145 @@
         InfcBrowserIter* browser_iter;
 
-        gtk_tree_model_get(GTK_TREE_MODEL(m_browser_model), iter,
+        gtk_tree_model_get(GTK_TREE_MODEL(m_browser_store), iter,
                            INF_GTK_BROWSER_MODEL_COL_BROWSER, &browser,
                            INF_GTK_BROWSER_MODEL_COL_NODE, &browser_iter,
@@ -254 +255 @@
         // adding.
 
-        inf_gtk_browser_model_add_connection(
-                m_browser_model, INF_XML_CONNECTION(xmpp),
+        inf_gtk_browser_store_add_connection(
+                m_browser_store, INF_XML_CONNECTION(xmpp),
                 hostname.c_str());
 }